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

cwIoMidiRecordPlay.cpp : Added delay after every damper pedal up to ensure that the strings are fully damped prior to the next damper down.

Browse Source
This commit is contained in:
kevin 2023-01-14 17:17:19 -05:00
parent 748bf9ab44
commit 3e4230bf5d
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cwIoMidiRecordPlay.cpp
View File

@ -128,6 +128,7 @@ namespace cw
bool logOutFl; // log outgoing messages bool logOutFl; // log outgoing messages
bool supressMidiXmitFl; // don't transmit MIDI bool supressMidiXmitFl; // don't transmit MIDI
unsigned minDamperDownMs;
bool velHistogramEnableFl; bool velHistogramEnableFl;
bool halfPedalFl; bool halfPedalFl;
@ -362,6 +363,7 @@ namespace cw
"midi_device_list", midiDevL, "midi_device_list", midiDevL,
"log_in_flag", p->logInFl, "log_in_flag", p->logInFl,
"log_out_flag", p->logOutFl, "log_out_flag", p->logOutFl,
"min_damper_down_time_ms", p->minDamperDownMs,
"half_pedal_flag", p->halfPedalFl)) != kOkRC ) "half_pedal_flag", p->halfPedalFl)) != kOkRC )
{ {
rc = cwLogError(kSyntaxErrorRC,"MIDI record play configuration parse failed."); rc = cwLogError(kSyntaxErrorRC,"MIDI record play configuration parse failed.");
@ -1511,6 +1513,10 @@ cw::rc_t cw::midi_record_play::load( handle_t h, const midi_msg_t* msg, unsigned
rc_t rc = kOkRC; rc_t rc = kOkRC;
midi_record_play_t* p = _handleToPtr(h); midi_record_play_t* p = _handleToPtr(h);
unsigned extraMs = 0;
unsigned curMicros = 0;
if( msg_count > p->msgArrayN ) if( msg_count > p->msgArrayN )
{ {
mem::release(p->msgArray); mem::release(p->msgArray);
@ -1520,6 +1526,13 @@ cw::rc_t cw::midi_record_play::load( handle_t h, const midi_msg_t* msg, unsigned
for(unsigned i=0; i<msg_count; ++i) for(unsigned i=0; i<msg_count; ++i)
{ {
if( i> 0)
{
unsigned deltaMicros = time::elapsedMicros(msg[i-1].timestamp,msg[i].timestamp);
curMicros += deltaMicros + (extraMs*1000);
}
p->msgArray[i].id = msg[i].id; p->msgArray[i].id = msg[i].id;
p->msgArray[i].timestamp = msg[i].timestamp; p->msgArray[i].timestamp = msg[i].timestamp;
p->msgArray[i].loc = msg[i].loc; p->msgArray[i].loc = msg[i].loc;
@ -1529,7 +1542,14 @@ cw::rc_t cw::midi_record_play::load( handle_t h, const midi_msg_t* msg, unsigned
p->msgArray[i].d1 = msg[i].d1; p->msgArray[i].d1 = msg[i].d1;
p->msgArray[i].devIdx = kInvalidIdx; p->msgArray[i].devIdx = kInvalidIdx;
p->msgArray[i].portIdx = kInvalidIdx; p->msgArray[i].portIdx = kInvalidIdx;
p->msgArray[i].microsec = time::elapsedMicros(p->msgArray[0].timestamp,p->msgArray[i].timestamp); //p->msgArray[i].microsec = time::elapsedMicros(p->msgArray[0].timestamp,p->msgArray[i].timestamp);
p->msgArray[i].microsec = curMicros;
//hprintf("%i %i\n",curMicros,time::elapsedMicros(p->msgArray[0].timestamp,p->msgArray[i].timestamp) );
extraMs = 0;
if( midi::isSustainPedalUp(msg[i].status,msg[i].d0,msg[i].d1))
extraMs = p->minDamperDownMs;
} }