cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwIoMidiRecordPlay.cpp : Merge after inadvertent 'stash pop'

Browse Source
This commit is contained in:
kevin 2023-04-11 08:36:04 -04:00
parent 47a5bbe06a
commit f5993f4aad
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cwIoMidiRecordPlay.cpp
View File

@ -528,7 +528,7 @@ namespace cw
bool supress_fl = (is_note_on_fl && after_stop_time_fl) || p->muteFl; bool supress_fl = (is_note_on_fl && after_stop_time_fl) || p->muteFl;
bool is_pedal_fl = midi::isPedal( status, d0 ); bool is_pedal_fl = midi::isPedal( status, d0 );
if( after_all_off_fl ) if( p->stateStateId == kExecuteStopStateId )
{ {
rc = _stop(p); rc = _stop(p);
} }
@ -1520,9 +1520,9 @@ cw::rc_t cw::midi_record_play::start( handle_t h, bool rewindFl, const time::spe
else else
{ {
p->end_play_event_timestamp = *end_play_event_timestamp; p->end_play_event_timestamp = *end_play_event_timestamp;
p->all_off_timestamp = *end_play_event_timestamp; //p->all_off_timestamp = *end_play_event_timestamp;
time::advanceMs( p->all_off_timestamp, p->all_off_delay_ms); //time::advanceMs( p->all_off_timestamp, p->all_off_delay_ms); }
}
time::get(p->start_time); time::get(p->start_time);
@ -1550,9 +1550,17 @@ cw::rc_t cw::midi_record_play::start( handle_t h, bool rewindFl, const time::spe
p->halfPedalState = kWaitForBegin; p->halfPedalState = kWaitForBegin;
} }
for(unsigned i=0; i<kMidiNoteCnt; ++i)
p->activeNoteV[i] = false;
p->activeDampFl = 0;
p->activeNoteCnt = 0;
p->stoppingStateId = kNoStopStateId;
io::timerStart( p->ioH, io::timerIdToIndex(p->ioH, kMidiRecordPlayTimerId) ); io::timerStart( p->ioH, io::timerIdToIndex(p->ioH, kMidiRecordPlayTimerId) );
} }
return kOkRC; return kOkRC;
} }