Issue #75: Disabled MIKMIDISequencer's use of MIKMIDIMetronome when d…

…eployment target is < iOS 8.
mixedinkey-opensource · Apr 8, 2015 · ccd0553 · ccd0553
1 parent 66efd41
commit ccd0553
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Source/MIKMIDIMetronome.m b/Source/MIKMIDIMetronome.m
@@ -21,18 +21,16 @@ - (BOOL)sendBankSelectAndProgramChangeForInstrumentID:(MusicDeviceInstrumentID)i
 
 @implementation MIKMIDIMetronome
 
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
 + (AudioComponentDescription)appleSynthComponentDescription
 {
 	AudioComponentDescription instrumentcd = (AudioComponentDescription){0};
 	instrumentcd.componentManufacturer = kAudioUnitManufacturer_Apple;
 	instrumentcd.componentType = kAudioUnitType_MusicDevice;
-#if TARGET_OS_IPHONE
 	instrumentcd.componentSubType = kAudioUnitSubType_MIDISynth;
-#else
-	instrumentcd.componentSubType = kAudioUnitSubType_DLSSynth;
-#endif
 	return instrumentcd;
 }
+#endif
 
 - (BOOL)setupMetronome
 {

diff --git a/Source/MIKMIDISequencer.m b/Source/MIKMIDISequencer.m
@@ -523,6 +523,8 @@ - (MIKMIDIDestinationEndpoint *)destinationEndpointForTrack:(MIKMIDITrack *)trac
 
 - (NSMutableArray *)clickTrackEventsFromTimeStamp:(MusicTimeStamp)fromTimeStamp toTimeStamp:(MusicTimeStamp)toTimeStamp
 {
+	if (!self.metronome) return [NSMutableArray array];
+
 	MIKMIDISequencerClickTrackStatus clickTrackStatus = self.clickTrackStatus;
 	if (clickTrackStatus == MIKMIDISequencerClickTrackStatusDisabled) return nil;
 	if (!self.isRecording && clickTrackStatus != MIKMIDISequencerClickTrackStatusAlwaysEnabled) return nil;
@@ -623,8 +625,10 @@ - (MIKMIDIClientDestinationEndpoint *)metronomeEndpoint
 @synthesize metronome = _metronome;
 - (MIKMIDIMetronome *)metronome
 {
+#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_8_0
 	if (!_metronome) _metronome = [[MIKMIDIMetronome alloc] initWithClientDestinationEndpoint:self.metronomeEndpoint];
 	return _metronome;
+#endif
 }
 
 - (void)setMetronome:(MIKMIDIMetronome *)metronome