diff --git a/Timecode Display.xcodeproj/project.pbxproj b/Timecode Display.xcodeproj/project.pbxproj index 294dee1..e821323 100644 --- a/Timecode Display.xcodeproj/project.pbxproj +++ b/Timecode Display.xcodeproj/project.pbxproj @@ -33,6 +33,8 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 42426FBE2A3866C800D87E93 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 42C7EBCE2A38B49B005E7730 /* CocoaAsyncSocket.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CocoaAsyncSocket.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9829C93429B91C3200156461 /* Timecode Display.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Timecode Display.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 9829C93729B91C3200156461 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 9829C93929B91C3300156461 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -57,11 +59,20 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 85582DA569CC3830D32E1076 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; 9829C92B29B91C3200156461 = { isa = PBXGroup; children = ( 9829C93629B91C3200156461 /* Timecode Display */, 9829C93529B91C3200156461 /* Products */, + 85582DA569CC3830D32E1076 /* Pods */, + D7F912904332858EC72210C1 /* Frameworks */, ); sourceTree = ""; }; @@ -89,6 +100,15 @@ path = "Timecode Display"; sourceTree = ""; }; + D7F912904332858EC72210C1 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 42C7EBCE2A38B49B005E7730 /* CocoaAsyncSocket.framework */, + 42426FBE2A3866C800D87E93 /* CocoaAsyncSocket.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -118,7 +138,7 @@ attributes = { BuildIndependentTargetsInParallel = 1; LastSwiftUpdateCheck = 1410; - LastUpgradeCheck = 1410; + LastUpgradeCheck = 1430; TargetAttributes = { 9829C93329B91C3200156461 = { CreatedOnToolsVersion = 14.1; @@ -215,6 +235,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -275,6 +296,7 @@ CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; + DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -301,10 +323,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Timecode Display/Timecode_Display.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 19999; - DEVELOPMENT_TEAM = 7672N4CCJM; + DEAD_CODE_STRIPPING = YES; + DEVELOPMENT_TEAM = 4KB97DBP5J; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -318,9 +343,11 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 2.0; PRODUCT_BUNDLE_IDENTIFIER = "com.figure53.Timecode-Display"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; }; @@ -332,10 +359,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = "Timecode Display/Timecode_Display.entitlements"; + CODE_SIGN_IDENTITY = "Apple Development"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; CURRENT_PROJECT_VERSION = 19999; - DEVELOPMENT_TEAM = 7672N4CCJM; + DEAD_CODE_STRIPPING = YES; + DEVELOPMENT_TEAM = 4KB97DBP5J; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -349,9 +379,11 @@ "$(inherited)", "@executable_path/../Frameworks", ); + MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; MARKETING_VERSION = 2.0; PRODUCT_BUNDLE_IDENTIFIER = "com.figure53.Timecode-Display"; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; }; diff --git a/Timecode Display/Base.lproj/MainMenu.xib b/Timecode Display/Base.lproj/MainMenu.xib index 2b2806d..82ce09e 100644 --- a/Timecode Display/Base.lproj/MainMenu.xib +++ b/Timecode Display/Base.lproj/MainMenu.xib @@ -1,7 +1,7 @@ - + - + @@ -123,7 +123,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -159,7 +159,7 @@ - + diff --git a/Timecode Display/TimecodeAnalyzer.swift b/Timecode Display/TimecodeAnalyzer.swift index 7cafc76..456e74f 100644 --- a/Timecode Display/TimecodeAnalyzer.swift +++ b/Timecode Display/TimecodeAnalyzer.swift @@ -6,41 +6,136 @@ // import AppKit +import Foundation +import Network +import SystemConfiguration class TimecodeAnalyzer: MIDIReceiverDelegate { private var timeLastFrameReceived: TimeInterval? private var lastReceivedTimecode: F53Timecode? private var freewheelTimer: Timer? - - func midiReceiver(_ sender: MIDIReceiver, didReceive timecode: F53Timecode) { - let now = NSDate.timeIntervalSinceReferenceDate - let timecodeString = timecode.stringRepresentation - let framerateString = timecode.framerate.speedAgnosticDescription - let appDelegate = NSApp.delegate as! AppDelegate + private let targetIPAddress = "172.20.102.255" // Replace with the IP address of your Art-Net device + private let targetPort: UInt16 = 6454 // Replace with the port number of your Art-Net device + private var udpConnection: NWConnection? + + init() { + setupUDPConnection() + } + + func setupUDPConnection() { + let udpParameters = NWParameters.udp + udpParameters.allowLocalEndpointReuse = true // Allow multiple connections to use the same port + + // Create a broadcast endpoint + let endpoint = NWEndpoint.hostPort(host: .ipv4(IPv4Address(targetIPAddress)!), port: NWEndpoint.Port(rawValue: targetPort)!) + + udpConnection = NWConnection(to: endpoint, using: udpParameters) + + udpConnection?.stateUpdateHandler = { [weak self] newState in + switch newState { + case .ready: + print("UDP connection established") + case .failed(let error): + print("UDP connection failed: \(error)") + default: + break + } + } + + udpConnection?.start(queue: DispatchQueue.main) + } + + func midiReceiver(_ sender: MIDIReceiver, didReceive timecode: F53Timecode) { + let now = NSDate.timeIntervalSinceReferenceDate + let timecodeString = timecode.stringRepresentation + let framerateString = timecode.framerate.speedAgnosticDescription + let appDelegate = NSApp.delegate as! AppDelegate - // Test for new starts or discontinuities - if timeLastFrameReceived == nil || now - timeLastFrameReceived! > 0.1 { - // It's been long enough that this is a new start. - appDelegate.appendLog("MTC start at \(timecodeString) - \(framerateString)") - } else { - if let lastReceivedTimecode, timecode.framesFromZero != lastReceivedTimecode.framesFromZero + 1 { - appDelegate.appendLog("MTC discontinuity - from \(lastReceivedTimecode.stringRepresentation) to \(timecodeString)") + // Test for new starts or discontinuities + if timeLastFrameReceived == nil || now - timeLastFrameReceived! > 0.1 { + // It's been long enough that this is a new start. + appDelegate.appendLog("MTC start at \(timecodeString) - \(framerateString)") + } else { + if let lastReceivedTimecode = lastReceivedTimecode, timecode.framesFromZero != lastReceivedTimecode.framesFromZero + 1 { + appDelegate.appendLog("MTC discontinuity - from \(lastReceivedTimecode.stringRepresentation) to \(timecodeString)") + } } + + // Convert MIDI timecode to Art-Net timecode + let artnetTimecode = convertToArtNetTimecode(timecode) + + // Send Art-Net timecode via UDP + sendArtNetTimecode(artnetTimecode) + + // Show in timecode window + appDelegate.timecodeView.stringValue = timecode.stringRepresentation + + // Freewheel + freewheelTimer?.invalidate() + freewheelTimer = Timer.scheduledTimer(withTimeInterval: 0.2, repeats: false, block: { timer in + appDelegate.appendLog("MTC stop at \(timecodeString)") + self.timeLastFrameReceived = nil + self.lastReceivedTimecode = nil + appDelegate.reserReceiver() + }) + + lastReceivedTimecode = timecode + timeLastFrameReceived = now } - // Show in timecode window - appDelegate.timecodeView.stringValue = timecode.stringRepresentation + private func convertToArtNetTimecode(_ midiTimecode: F53Timecode) -> Data { + // Create an Art-Net timecode packet + var packet: [UInt8] = [ + // Art-Net ID + 0x41, 0x72, 0x74, 0x2D, 0x4E, 0x65, 0x74, 0x00, + // ArtTimecode OpCode + 0x00, 0x97, + // ProtVer + 0x00, 0x0E, + // Filler1-2 + 0x00, 0x00, + // ArtTimeCode + 0x00, // Frames + 0x00, // Seonds + 0x00, // Minutes + 0x00, // Hours + 0x00, // Type Frame rate (0 = 24fps, 1 = 25fps, 2 = 30fps, 3 = 29.97fps) + ] + + // Set the hours, minutes, seconds, and frames based on the MIDI timecode + packet[14] = UInt8(midiTimecode.ff) + packet[15] = UInt8(midiTimecode.ss) + packet[16] = UInt8(midiTimecode.mm) + packet[17] = UInt8(midiTimecode.hh) - // Freewheel - freewheelTimer?.invalidate() - freewheelTimer = Timer.scheduledTimer(withTimeInterval: 0.2, repeats: false, block: { timer in - appDelegate.appendLog("MTC stop at \(timecodeString)") - self.timeLastFrameReceived = nil - self.lastReceivedTimecode = nil - appDelegate.reserReceiver() - }) + // Set the frame rate based on the MIDI timecode frame rate + let frameRate: UInt8 + switch midiTimecode.framerate { + case ._24: + frameRate = 0x00 + case ._25: + frameRate = 0x01 + case ._30nd: + frameRate = 0x02 + case ._2997nd: + frameRate = 0x03 + default: + frameRate = 0x00 + } + packet[18] = frameRate - lastReceivedTimecode = timecode - timeLastFrameReceived = now + // Convert the packet to Data + let packetData = Data(packet) + return packetData + } + + private func sendArtNetTimecode(_ timecode: Data) { + udpConnection?.send(content: timecode, completion: .contentProcessed { error in + if let error = error { + print("Failed to send Art-Net timecode: \(error)") + } else { + print("Art-Net timecode sent successfully") + } + }) + } } -} diff --git a/Timecode Display/Timecode_Display.entitlements b/Timecode Display/Timecode_Display.entitlements index f2ef3ae..40b639e 100644 --- a/Timecode Display/Timecode_Display.entitlements +++ b/Timecode Display/Timecode_Display.entitlements @@ -2,9 +2,13 @@ - com.apple.security.app-sandbox - - com.apple.security.files.user-selected.read-only - + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + com.apple.security.network.client + + com.apple.security.network.server + diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Headers/SnoizeMIDI-Swift.h b/third_party/SnoizeMIDI.framework/Versions/A/Headers/SnoizeMIDI-Swift.h index d31921c..5323074 100644 --- a/third_party/SnoizeMIDI.framework/Versions/A/Headers/SnoizeMIDI-Swift.h +++ b/third_party/SnoizeMIDI.framework/Versions/A/Headers/SnoizeMIDI-Swift.h @@ -1,6 +1,6 @@ #if 0 #elif defined(__arm64__) && __arm64__ -// Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3 clang-1400.0.29.51) +// Generated by Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100) #ifndef SNOIZEMIDI_SWIFT_H #define SNOIZEMIDI_SWIFT_H #pragma clang diagnostic push @@ -23,7 +23,6 @@ # include #endif -#pragma clang diagnostic ignored "-Wduplicate-method-match" #pragma clang diagnostic ignored "-Wauto-import" #if defined(__OBJC__) #include @@ -32,10 +31,24 @@ #include #include #include +#include +#include +#include +#include #else #include #include #include +#include +#endif +#if defined(__cplusplus) +#if __has_include() +# include +#else +# ifndef __ptrauth_swift_value_witness_function_pointer +# define __ptrauth_swift_value_witness_function_pointer(x) +# endif +#endif #endif #if !defined(SWIFT_TYPEDEFS) @@ -71,53 +84,66 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # if __has_feature(objc_class_property) # define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ # else -# define SWIFT_CLASS_PROPERTY(...) +# define SWIFT_CLASS_PROPERTY(...) # endif #endif - -#if __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) +#if !defined(SWIFT_RUNTIME_NAME) +# if __has_attribute(objc_runtime_name) +# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) +# else +# define SWIFT_RUNTIME_NAME(X) +# endif #endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) +#if !defined(SWIFT_COMPILE_NAME) +# if __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +# else +# define SWIFT_COMPILE_NAME(X) +# endif #endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) +#if !defined(SWIFT_METHOD_FAMILY) +# if __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +# else +# define SWIFT_METHOD_FAMILY(X) +# endif #endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE +#if !defined(SWIFT_NOESCAPE) +# if __has_attribute(noescape) +# define SWIFT_NOESCAPE __attribute__((noescape)) +# else +# define SWIFT_NOESCAPE +# endif #endif -#if __has_attribute(ns_consumed) -# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed)) -#else -# define SWIFT_RELEASES_ARGUMENT +#if !defined(SWIFT_RELEASES_ARGUMENT) +# if __has_attribute(ns_consumed) +# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed)) +# else +# define SWIFT_RELEASES_ARGUMENT +# endif #endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT +#if !defined(SWIFT_WARN_UNUSED_RESULT) +# if __has_attribute(warn_unused_result) +# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) +# else +# define SWIFT_WARN_UNUSED_RESULT +# endif #endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN +#if !defined(SWIFT_NORETURN) +# if __has_attribute(noreturn) +# define SWIFT_NORETURN __attribute__((noreturn)) +# else +# define SWIFT_NORETURN +# endif #endif #if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_EXTRA #endif #if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA +# define SWIFT_ENUM_EXTRA #endif #if !defined(SWIFT_CLASS) # if __has_attribute(objc_subclassing_restricted) @@ -137,28 +163,25 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME) # endif #endif - #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA # define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif - #if !defined(SWIFT_EXTENSION) # define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) #endif - #if !defined(OBJC_DESIGNATED_INITIALIZER) # if __has_attribute(objc_designated_initializer) # define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) # else -# define OBJC_DESIGNATED_INITIALIZER +# define OBJC_DESIGNATED_INITIALIZER # endif #endif #if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) +# if __has_attribute(enum_extensibility) # define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility))) # else -# define SWIFT_ENUM_ATTR(_extensibility) +# define SWIFT_ENUM_ATTR(_extensibility) # endif #endif #if !defined(SWIFT_ENUM) @@ -187,14 +210,16 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_DEPRECATED_MSG) # define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) #endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) +#if !defined(SWIFT_DEPRECATED_OBJC) +# if __has_feature(attribute_diagnose_if_objc) +# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) +# else +# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) +# endif #endif #if defined(__OBJC__) #if !defined(IBSegueAction) -# define IBSegueAction +# define IBSegueAction #endif #endif #if !defined(SWIFT_EXTERN) @@ -207,26 +232,31 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_CALL) # define SWIFT_CALL __attribute__((swiftcall)) #endif +#if !defined(SWIFT_INDIRECT_RESULT) +# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result)) +#endif +#if !defined(SWIFT_CONTEXT) +# define SWIFT_CONTEXT __attribute__((swift_context)) +#endif +#if !defined(SWIFT_ERROR_RESULT) +# define SWIFT_ERROR_RESULT __attribute__((swift_error_result)) +#endif #if defined(__cplusplus) -#if !defined(SWIFT_NOEXCEPT) # define SWIFT_NOEXCEPT noexcept -#endif #else -#if !defined(SWIFT_NOEXCEPT) # define SWIFT_NOEXCEPT #endif +#if defined(_WIN32) +#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL) +# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport) #endif -#if defined(__cplusplus) -#if !defined(SWIFT_CXX_INT_DEFINED) -#define SWIFT_CXX_INT_DEFINED -namespace swift { -using Int = ptrdiff_t; -using UInt = size_t; -} +#else +#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL) +# define SWIFT_IMPORT_STDLIB_SYMBOL #endif #endif #if defined(__OBJC__) -#if __has_feature(modules) +#if __has_feature(objc_modules) #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif @@ -395,7 +425,7 @@ SWIFT_CLASS("_TtC10SnoizeMIDI12VoiceMessage") #endif #elif defined(__x86_64__) && __x86_64__ -// Generated by Apple Swift version 5.7.1 (swiftlang-5.7.1.135.3 clang-1400.0.29.51) +// Generated by Apple Swift version 5.8.1 (swiftlang-5.8.0.124.5 clang-1403.0.22.11.100) #ifndef SNOIZEMIDI_SWIFT_H #define SNOIZEMIDI_SWIFT_H #pragma clang diagnostic push @@ -418,7 +448,6 @@ SWIFT_CLASS("_TtC10SnoizeMIDI12VoiceMessage") # include #endif -#pragma clang diagnostic ignored "-Wduplicate-method-match" #pragma clang diagnostic ignored "-Wauto-import" #if defined(__OBJC__) #include @@ -427,10 +456,24 @@ SWIFT_CLASS("_TtC10SnoizeMIDI12VoiceMessage") #include #include #include +#include +#include +#include +#include #else #include #include #include +#include +#endif +#if defined(__cplusplus) +#if __has_include() +# include +#else +# ifndef __ptrauth_swift_value_witness_function_pointer +# define __ptrauth_swift_value_witness_function_pointer(x) +# endif +#endif #endif #if !defined(SWIFT_TYPEDEFS) @@ -466,53 +509,66 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # if __has_feature(objc_class_property) # define SWIFT_CLASS_PROPERTY(...) __VA_ARGS__ # else -# define SWIFT_CLASS_PROPERTY(...) +# define SWIFT_CLASS_PROPERTY(...) # endif #endif - -#if __has_attribute(objc_runtime_name) -# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) -#else -# define SWIFT_RUNTIME_NAME(X) +#if !defined(SWIFT_RUNTIME_NAME) +# if __has_attribute(objc_runtime_name) +# define SWIFT_RUNTIME_NAME(X) __attribute__((objc_runtime_name(X))) +# else +# define SWIFT_RUNTIME_NAME(X) +# endif #endif -#if __has_attribute(swift_name) -# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) -#else -# define SWIFT_COMPILE_NAME(X) +#if !defined(SWIFT_COMPILE_NAME) +# if __has_attribute(swift_name) +# define SWIFT_COMPILE_NAME(X) __attribute__((swift_name(X))) +# else +# define SWIFT_COMPILE_NAME(X) +# endif #endif -#if __has_attribute(objc_method_family) -# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) -#else -# define SWIFT_METHOD_FAMILY(X) +#if !defined(SWIFT_METHOD_FAMILY) +# if __has_attribute(objc_method_family) +# define SWIFT_METHOD_FAMILY(X) __attribute__((objc_method_family(X))) +# else +# define SWIFT_METHOD_FAMILY(X) +# endif #endif -#if __has_attribute(noescape) -# define SWIFT_NOESCAPE __attribute__((noescape)) -#else -# define SWIFT_NOESCAPE +#if !defined(SWIFT_NOESCAPE) +# if __has_attribute(noescape) +# define SWIFT_NOESCAPE __attribute__((noescape)) +# else +# define SWIFT_NOESCAPE +# endif #endif -#if __has_attribute(ns_consumed) -# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed)) -#else -# define SWIFT_RELEASES_ARGUMENT +#if !defined(SWIFT_RELEASES_ARGUMENT) +# if __has_attribute(ns_consumed) +# define SWIFT_RELEASES_ARGUMENT __attribute__((ns_consumed)) +# else +# define SWIFT_RELEASES_ARGUMENT +# endif #endif -#if __has_attribute(warn_unused_result) -# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) -#else -# define SWIFT_WARN_UNUSED_RESULT +#if !defined(SWIFT_WARN_UNUSED_RESULT) +# if __has_attribute(warn_unused_result) +# define SWIFT_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) +# else +# define SWIFT_WARN_UNUSED_RESULT +# endif #endif -#if __has_attribute(noreturn) -# define SWIFT_NORETURN __attribute__((noreturn)) -#else -# define SWIFT_NORETURN +#if !defined(SWIFT_NORETURN) +# if __has_attribute(noreturn) +# define SWIFT_NORETURN __attribute__((noreturn)) +# else +# define SWIFT_NORETURN +# endif #endif #if !defined(SWIFT_CLASS_EXTRA) -# define SWIFT_CLASS_EXTRA +# define SWIFT_CLASS_EXTRA #endif #if !defined(SWIFT_PROTOCOL_EXTRA) -# define SWIFT_PROTOCOL_EXTRA +# define SWIFT_PROTOCOL_EXTRA #endif #if !defined(SWIFT_ENUM_EXTRA) -# define SWIFT_ENUM_EXTRA +# define SWIFT_ENUM_EXTRA #endif #if !defined(SWIFT_CLASS) # if __has_attribute(objc_subclassing_restricted) @@ -532,28 +588,25 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); # define SWIFT_RESILIENT_CLASS_NAMED(SWIFT_NAME) SWIFT_CLASS_NAMED(SWIFT_NAME) # endif #endif - #if !defined(SWIFT_PROTOCOL) # define SWIFT_PROTOCOL(SWIFT_NAME) SWIFT_RUNTIME_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA # define SWIFT_PROTOCOL_NAMED(SWIFT_NAME) SWIFT_COMPILE_NAME(SWIFT_NAME) SWIFT_PROTOCOL_EXTRA #endif - #if !defined(SWIFT_EXTENSION) # define SWIFT_EXTENSION(M) SWIFT_PASTE(M##_Swift_, __LINE__) #endif - #if !defined(OBJC_DESIGNATED_INITIALIZER) # if __has_attribute(objc_designated_initializer) # define OBJC_DESIGNATED_INITIALIZER __attribute__((objc_designated_initializer)) # else -# define OBJC_DESIGNATED_INITIALIZER +# define OBJC_DESIGNATED_INITIALIZER # endif #endif #if !defined(SWIFT_ENUM_ATTR) -# if defined(__has_attribute) && __has_attribute(enum_extensibility) +# if __has_attribute(enum_extensibility) # define SWIFT_ENUM_ATTR(_extensibility) __attribute__((enum_extensibility(_extensibility))) # else -# define SWIFT_ENUM_ATTR(_extensibility) +# define SWIFT_ENUM_ATTR(_extensibility) # endif #endif #if !defined(SWIFT_ENUM) @@ -582,14 +635,16 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_DEPRECATED_MSG) # define SWIFT_DEPRECATED_MSG(...) __attribute__((deprecated(__VA_ARGS__))) #endif -#if __has_feature(attribute_diagnose_if_objc) -# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) -#else -# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) +#if !defined(SWIFT_DEPRECATED_OBJC) +# if __has_feature(attribute_diagnose_if_objc) +# define SWIFT_DEPRECATED_OBJC(Msg) __attribute__((diagnose_if(1, Msg, "warning"))) +# else +# define SWIFT_DEPRECATED_OBJC(Msg) SWIFT_DEPRECATED_MSG(Msg) +# endif #endif #if defined(__OBJC__) #if !defined(IBSegueAction) -# define IBSegueAction +# define IBSegueAction #endif #endif #if !defined(SWIFT_EXTERN) @@ -602,26 +657,31 @@ typedef unsigned int swift_uint4 __attribute__((__ext_vector_type__(4))); #if !defined(SWIFT_CALL) # define SWIFT_CALL __attribute__((swiftcall)) #endif +#if !defined(SWIFT_INDIRECT_RESULT) +# define SWIFT_INDIRECT_RESULT __attribute__((swift_indirect_result)) +#endif +#if !defined(SWIFT_CONTEXT) +# define SWIFT_CONTEXT __attribute__((swift_context)) +#endif +#if !defined(SWIFT_ERROR_RESULT) +# define SWIFT_ERROR_RESULT __attribute__((swift_error_result)) +#endif #if defined(__cplusplus) -#if !defined(SWIFT_NOEXCEPT) # define SWIFT_NOEXCEPT noexcept -#endif #else -#if !defined(SWIFT_NOEXCEPT) # define SWIFT_NOEXCEPT #endif +#if defined(_WIN32) +#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL) +# define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport) #endif -#if defined(__cplusplus) -#if !defined(SWIFT_CXX_INT_DEFINED) -#define SWIFT_CXX_INT_DEFINED -namespace swift { -using Int = ptrdiff_t; -using UInt = size_t; -} +#else +#if !defined(SWIFT_IMPORT_STDLIB_SYMBOL) +# define SWIFT_IMPORT_STDLIB_SYMBOL #endif #endif #if defined(__OBJC__) -#if __has_feature(modules) +#if __has_feature(objc_modules) #if __has_warning("-Watimport-in-framework-header") #pragma clang diagnostic ignored "-Watimport-in-framework-header" #endif diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo index 97fcb44..15f4796 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/arm64-apple-macos.swiftsourceinfo differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo index 1ff8ccc..0420e60 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/Project/x86_64-apple-macos.swiftsourceinfo differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftdoc b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftdoc index a11e835..7a13396 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftdoc and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftdoc differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftmodule b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftmodule index 1ed4358..0a176ad 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftmodule and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/arm64-apple-macos.swiftmodule differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftdoc b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftdoc index 59185b6..6700781 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftdoc and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftdoc differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftmodule b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftmodule index e1842b6..59781d0 100644 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftmodule and b/third_party/SnoizeMIDI.framework/Versions/A/Modules/SnoizeMIDI.swiftmodule/x86_64-apple-macos.swiftmodule differ diff --git a/third_party/SnoizeMIDI.framework/Versions/A/Resources/Info.plist b/third_party/SnoizeMIDI.framework/Versions/A/Resources/Info.plist index faa8678..abbb4c5 100644 --- a/third_party/SnoizeMIDI.framework/Versions/A/Resources/Info.plist +++ b/third_party/SnoizeMIDI.framework/Versions/A/Resources/Info.plist @@ -3,7 +3,7 @@ BuildMachineOSBuild - 22A380 + 22F66 CFBundleDevelopmentRegion English CFBundleExecutable @@ -27,19 +27,19 @@ DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 14B47b + DTPlatformName macosx DTPlatformVersion - 13.0 + 13.3 DTSDKBuild - 22A372 + 22E245 DTSDKName - macosx13.0 + macosx13.3 DTXcode - 1410 + 1431 DTXcodeBuild - 14B47b + 14E300c LSMinimumSystemVersion 10.13 diff --git a/third_party/SnoizeMIDI.framework/Versions/A/SnoizeMIDI b/third_party/SnoizeMIDI.framework/Versions/A/SnoizeMIDI index 8129089..f9e32fb 100755 Binary files a/third_party/SnoizeMIDI.framework/Versions/A/SnoizeMIDI and b/third_party/SnoizeMIDI.framework/Versions/A/SnoizeMIDI differ