From ad2bc97bd9b44fb1c737e0a9ed829b59e35bacd9 Mon Sep 17 00:00:00 2001 From: Andrew Madsen Date: Sat, 17 Mar 2018 16:41:33 -0600 Subject: [PATCH] Issue #238: Change #defines in MIKMIDISystemExclusiveCommand to real variables with appropriate types --- Source/MIKMIDISystemExclusiveCommand.h | 10 +++++----- Source/MIKMIDISystemExclusiveCommand.m | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Source/MIKMIDISystemExclusiveCommand.h b/Source/MIKMIDISystemExclusiveCommand.h index 764fbb08..d3cff44e 100644 --- a/Source/MIKMIDISystemExclusiveCommand.h +++ b/Source/MIKMIDISystemExclusiveCommand.h @@ -9,12 +9,12 @@ #import "MIKMIDISystemMessageCommand.h" #import "MIKMIDICompilerCompatibility.h" -#define kMIKMIDISysexNonRealtimeManufacturerID 0x7E -#define kMIKMIDISysexRealtimeManufacturerID 0x7F +extern uint32_t const kMIKMIDISysexNonRealtimeManufacturerID; +extern uint32_t const kMIKMIDISysexRealtimeManufacturerID; -#define kMIKMIDISysexChannelDisregard 0x7F -#define kMIKMIDISysexBeginDelimiter 0xF0 -#define kMIKMIDISysexEndDelimiter 0xF7 +extern uint8_t const kMIKMIDISysexChannelDisregard; +extern uint8_t const kMIKMIDISysexBeginDelimiter; +extern uint8_t const kMIKMIDISysexEndDelimiter; NS_ASSUME_NONNULL_BEGIN diff --git a/Source/MIKMIDISystemExclusiveCommand.m b/Source/MIKMIDISystemExclusiveCommand.m index 2f9df24b..5767d1bf 100644 --- a/Source/MIKMIDISystemExclusiveCommand.m +++ b/Source/MIKMIDISystemExclusiveCommand.m @@ -14,6 +14,13 @@ #error MIKMIDISystemExclusiveCommand.m must be compiled with ARC. Either turn on ARC for the project or set the -fobjc-arc flag for MIKMIDISystemExclusiveCommand.m in the Build Phases for this target #endif +uint32_t const kMIKMIDISysexNonRealtimeManufacturerID = 0x7E; +uint32_t const kMIKMIDISysexRealtimeManufacturerID = 0x7F; + +uint8_t const kMIKMIDISysexChannelDisregard = 0x7F; +uint8_t const kMIKMIDISysexBeginDelimiter = 0xF0; +uint8_t const kMIKMIDISysexEndDelimiter = 0xF7; + @interface MIKMIDISystemExclusiveCommand () @property (nonatomic, readwrite) UInt32 manufacturerID;