cml/libcm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmDspKr.c : Updates to use amicro instead of dtick in MIDI mesg.

Browse Source
This commit is contained in:
kevin 2015-11-19 19:13:18 -05:00
parent 136cb97800
commit c9eaf40705
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dsp/cmDspKr.c
View File

@ -756,7 +756,7 @@ unsigned _cmDspMidiFilePlaySeekMsgIdx( cmDspCtx_t* ctx, cmDspInst_t* inst, unsig
const cmMidiTrackMsg_t** a = cmMidiFileMsgArray(p->mfH); const cmMidiTrackMsg_t** a = cmMidiFileMsgArray(p->mfH);
for(i=0; i<n; ++i) for(i=0; i<n; ++i)
if( a[i]->dtick > smpIdx ) if( (a[i]->amicro * cmDspSampleRate(ctx) / 1000000.0) >= smpIdx )
break; break;
return i==n ? cmInvalidIdx : i; return i==n ? cmInvalidIdx : i;
@ -786,7 +786,7 @@ cmDspRC_t _cmDspMidiFilePlayOpen(cmDspCtx_t* ctx, cmDspInst_t* inst )
cmMidiFileSetDelay(p->mfH, cmMidiFileTicksPerQN(p->mfH) ); cmMidiFileSetDelay(p->mfH, cmMidiFileTicksPerQN(p->mfH) );
// convert midi msg times to absolute time in samples // convert midi msg times to absolute time in samples
cmMidiFileTickToSamples(p->mfH,cmDspSampleRate(ctx),true); //cmMidiFileTickToSamples(p->mfH,cmDspSampleRate(ctx),true);
} }
return rc; return rc;
@ -820,23 +820,37 @@ cmDspRC_t _cmDspMidiFilePlayExec(cmDspCtx_t* ctx, cmDspInst_t* inst, const cmDsp
const cmMidiTrackMsg_t** mpp = cmMidiFileMsgArray(p->mfH); const cmMidiTrackMsg_t** mpp = cmMidiFileMsgArray(p->mfH);
unsigned msgN = cmMidiFileMsgCount(p->mfH); unsigned msgN = cmMidiFileMsgCount(p->mfH);
for(; p->curMsgIdx < msgN && p->csi <= mpp[p->curMsgIdx]->dtick && mpp[p->curMsgIdx]->dtick < (p->csi + sPc); ++p->curMsgIdx ) do
{ {
if( p->curMsgIdx >= msgN )
break;
const cmMidiTrackMsg_t* mp = mpp[p->curMsgIdx]; const cmMidiTrackMsg_t* mp = mpp[p->curMsgIdx];
// convert the absolute time in microseconds to samples
unsigned curMsgTimeSmp = round(mp->amicro * cmDspSampleRate(ctx) / 1000000.0);
// if this midi event falls inside this execution window
if( p->csi > curMsgTimeSmp || curMsgTimeSmp >= (p->csi + sPc))
break;
switch( mp->status ) switch( mp->status )
{ {
case kNoteOffMdId: case kNoteOffMdId:
case kNoteOnMdId: case kNoteOnMdId:
case kCtlMdId: case kCtlMdId:
cmDspSetUInt(ctx,inst, kSmpIdxMfId, mp->dtick); cmDspSetUInt(ctx,inst, kSmpIdxMfId, curMsgTimeSmp);
cmDspSetUInt(ctx,inst, kD1MfId, mp->u.chMsgPtr->d1); cmDspSetUInt(ctx,inst, kD1MfId, mp->u.chMsgPtr->d1);
cmDspSetUInt(ctx,inst, kD0MfId, mp->u.chMsgPtr->d0); cmDspSetUInt(ctx,inst, kD0MfId, mp->u.chMsgPtr->d0);
cmDspSetUInt(ctx,inst, kStatusMfId, mp->status); cmDspSetUInt(ctx,inst, kStatusMfId, mp->status);
cmDspSetUInt(ctx,inst, kIdMfId, mp->uid); cmDspSetUInt(ctx,inst, kIdMfId, mp->uid);
break; break;
} }
}
p->curMsgIdx += 1;
}while(1);
} }
p->csi += sPc; p->csi += sPc;