Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.6 Release #156

Merged
merged 53 commits into from
Jun 1, 2016
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
270ee37
Issue #134: Added -[MIKMIDISequence addTrackWithError:] and deprecate…
Mar 2, 2016
a9309e7
Merge branch '1.6' into Issue134
Mar 3, 2016
e9d5c7b
Issue #134: Fixed use of now-deprecated -addTrack: in tests.
Mar 3, 2016
e9c6703
Merge pull request #136 from mixedinkey-opensource/Issue134
armadsen Mar 3, 2016
0e287cc
Issue #45: Fixed issue where MIKMIDISequencer would repeatedly proces…
Mar 3, 2016
72f1275
Issue #99: MIKMIDISequencer respects MIKMIDITrack's muted property. O…
Mar 5, 2016
62969ab
Issue #99: MIKMIDISequencer now respects MIKMIDITrack's solo property.
Mar 8, 2016
44b2b58
Issue #99: Updated documentation for MIKMIDITrack's muted and solo pr…
Mar 8, 2016
f05760c
Issue #99: Made MIKMIDITrack's offset property use an instance variab…
Mar 8, 2016
7c28b0c
Issue #99: MIKMIDISequencer now respects MIKMIDITrack's offset proper…
Mar 8, 2016
eaf3708
Issue #99: Minor update to documentation for MIKMIDITrack offset prop…
Mar 8, 2016
836bba8
Issue #99: Fixed minor mistake in -[MIKMIDITrack isSolo].
Mar 8, 2016
667cbab
Merge pull request #138 from mixedinkey-opensource/Issue99
armadsen Mar 8, 2016
a50ccdf
Switched to AUSampler for MIKMIDIMetronome on iOS to allow loading so…
Mar 8, 2016
07a9304
Note off time stamps now correctly account for the playbackOffset.
kris2point0 Mar 9, 2016
bf6d53f
Removed the playbackOffset property, and reworked how the pre roll is…
kris2point0 Mar 9, 2016
af8f7b3
Minor documentation improvement for MIKMIDISequencer's currentTimeSta…
Mar 9, 2016
40a016e
Merge
Mar 9, 2016
2312e4d
MIKMIDISequencer now ignores calls to -recordMIDICommand during pre-r…
Mar 10, 2016
4c0ce02
Fixed crash in -[MIKMIDISequencer recordAllPendingNoteEventsWithOffTi…
Mar 10, 2016
bb860d4
Fixed bad error handling code in -addTrackWithError:
Mar 11, 2016
658cb63
Made MIKMIDIGetCurrentTimeStamp() a real function so it bridges into …
Mar 11, 2016
c4956d9
MIKMIDISequencer uses command's time stamp to decide whether to ignor…
Mar 16, 2016
ac8142b
Added maximumLookAheadInterval property to MIKMIDISequencer
kris2point0 Mar 17, 2016
6698fad
Fixed issue where notes could be scheduled with the synth's AudioUnit…
kris2point0 Mar 18, 2016
2535c5b
Fixed issue where click track events would be added to the beginning …
kris2point0 Mar 18, 2016
b3a5eaa
Minor tweak to MIKMIDICommand (MIKMIDINoteEventToCommands).
Mar 21, 2016
5cb5aff
Merge branch 'master' into 1.6
Mar 21, 2016
745cc0e
Fixed warning.
kris2point0 Mar 22, 2016
0bf4a00
Added convenience initializers to the MIDI note commands to be able t…
kris2point0 Mar 25, 2016
fad6143
Fixed documentation warning
kris2point0 Mar 31, 2016
f5ad755
Issue #150: Refactored aspects of MIKMIDIMetaEvent initialiation, and…
Apr 21, 2016
d6c969c
Issue #150: Added customized initializer for MIKMIDIMetaTextEvent.
Apr 21, 2016
4d7b3f2
Issue #150: Added custom initializer to MIKMIDIMetaTrackSequenceNameE…
Apr 21, 2016
30f8b0a
Merge branch 'master' into 1.6
Apr 21, 2016
d64a35d
Issue #150: Added custom initializers for MIKMIDIMetaTimeSignatureEvent.
Apr 21, 2016
2cf4e4f
Made MIKMIDIMetaEvent_SubclassMethods available as an explicit submod…
Apr 21, 2016
33aed7c
Added tests for alloc/init on MIKMIDIMetaEvent and subclasses.
Apr 21, 2016
1962a1a
Issue #150: Added custom initializer and new properties for MIKMIDIMe…
armadsen Apr 22, 2016
87b38ea
Made it possible for MIKMIDISynthesizer subclasses to commandeer the …
kris2point0 Apr 25, 2016
d9bf629
Issue #150: MIKMIDITempoEvent convenience method now returns a non-nu…
Apr 26, 2016
523d49e
MIKMIDISequencer now skips over notes with a duration of zero of less.
kris2point0 Apr 28, 2016
0fc1069
-sendAllPendingNoteOffsWithMIDITimeStamp: now waits until after the l…
kris2point0 Apr 28, 2016
b5cfe0c
Skip scheduling the commands if the array is empty in -stopAllPlaying…
kris2point0 Apr 29, 2016
6ebbb24
MIDI Files Testbed: Updated project build settings to fix warning in …
May 10, 2016
736938f
MIDI Files Testbed: Updated to stop using deprecated -[MIKMIDISequenc…
May 10, 2016
d0ada0a
Issue #119: MIDI Soundboard example for iOS uses framework sub-projec…
Jun 1, 2016
a35ee94
MIDI Soundboard: Switched from aiff samples and AVAudioPlayer to MIKM…
Jun 1, 2016
3ea9210
Added README for MIDI Soundboard.
Jun 1, 2016
0c34f57
Bumped version to 1.6 in podspec.
Jun 1, 2016
a15a464
Issue #125: Fixed incorrect length for certain command types when ini…
Jun 1, 2016
cc8e4a6
Added explicity ownership semantics to sendMIDICommand block property…
Jun 1, 2016
c500418
Added 1.6.0 notes to CHANGELOG
Jun 1, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
MIKMIDISequencer uses command's time stamp to decide whether to ignor…
…e a recorded command in pre-roll.
Andrew Madsen committed Mar 16, 2016
commit c4956d9238165f0d1271f773c046219f833c7f5d
3 changes: 2 additions & 1 deletion Source/MIKMIDISequencer.m
Original file line number Diff line number Diff line change
@@ -535,10 +535,11 @@ - (void)prepareForRecordingWithPreRoll:(BOOL)includePreRoll
- (void)recordMIDICommand:(MIKMIDICommand *)command
{
if (!self.isRecording) return;
if (self.currentTimeStamp < 0) return; // In pre-roll

MIDITimeStamp midiTimeStamp = command.midiTimestamp;
MusicTimeStamp musicTimeStamp = [self.clock musicTimeStampForMIDITimeStamp:midiTimeStamp];

if (musicTimeStamp < 0) { return; } // Command is in pre-roll

MIKMIDIEvent *event;
if ([command isKindOfClass:[MIKMIDINoteOnCommand class]]) { // note On