From a142123bd87a4cf2d2a5a391f9c9a9d53f5d80a5 Mon Sep 17 00:00:00 2001 From: kevin Date: Thu, 19 Nov 2015 19:14:42 -0500 Subject: [PATCH] cmTimeLine.c : Updates to use amicro instead of dticks in MIDI msgs. --- app/cmTimeLine.c | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/app/cmTimeLine.c b/app/cmTimeLine.c index fe21e60..b40cbef 100644 --- a/app/cmTimeLine.c +++ b/app/cmTimeLine.c @@ -530,16 +530,14 @@ cmTlRC_t _cmTlAllocRecd2( tp->flags = 0; tp->text = NULL; + //printf("%9i %9i %9i %9i\n",tp->begSmpIdx,tp->durSmpCnt,refPtr==NULL?0:refPtr->obj->seqSmpIdx, tp->seqSmpIdx); + op->obj = tp; op->mem = mem; op->memByteCnt = byteCnt; op->next = NULL; op->prev = NULL; - - //if( seqId == 4 ) - // printf("seq:%i id:%i type:%i accum:%i ref:%i offs:%i %f\n",seqId, tp->uid, tp->typeId, tp->seqSmpIdx, refPtr==NULL?-1:refPtr->obj->uid, begSmpIdx, begSmpIdx/(96000.0*60.0) ); - _cmTlInsertAfter(p, _cmTlFindRecdBefore(p,op), op ); @@ -651,36 +649,36 @@ cmTlRC_t _cmTlProcMidiFile( _cmTl_t* p, _cmTlObj_t* op, cmMidiFileH_t mfH ) const cmMidiTrackMsg_t** mapp = cmMidiFileMsgArray(mfH); unsigned mi = 0; _cmTlObj_t* refOp = op; + double smpPerMicro = p->srate / 1000000.0; + unsigned begSmpIdx0 = 0; mfp->noteOnCnt = 0; // for each midi message for(; midtick; - int durSmpCnt = 0; - unsigned midiTrkMsgByteCnt = cmMidiFilePackTrackMsgBufByteCount( mp ); - unsigned recdByteCnt = sizeof(cmTlMidiEvt_t) + midiTrkMsgByteCnt; - - //if( mfp->obj.seqId==4 && mi<=25 ) - // printf("%s: bsi:%9i acc:%f smp acc:%f min %s\n", mp->status == kNoteOnMdId?"non":" ", begSmpIdx, accum, accum / (p->srate * 60),cmStringNullGuard(mfp->obj.name)); + _cmTlObj_t* meop = NULL; + const cmMidiTrackMsg_t* mp = mapp[mi]; + int begSmpIdx = mp->amicro * smpPerMicro; + int durSmpCnt = 0; + unsigned midiTrkMsgByteCnt = cmMidiFilePackTrackMsgBufByteCount( mp ); + unsigned recdByteCnt = sizeof(cmTlMidiEvt_t) + midiTrkMsgByteCnt; // count the note-on messages if( cmMidiIsNoteOn(mp->status) ) { - durSmpCnt = mp->u.chMsgPtr->durTicks; + durSmpCnt = mp->u.chMsgPtr->durMicros * smpPerMicro; ++mfp->noteOnCnt; } if( cmMidiIsCtl(mp->status) && cmMidiIsSustainPedal(mp->status,mp->u.chMsgPtr->d0) ) - durSmpCnt = mp->u.chMsgPtr->durTicks; + durSmpCnt = mp->u.chMsgPtr->durMicros * smpPerMicro; // allocate the generic time-line object record - if((rc = _cmTlAllocRecd2(p, NULL, refOp, begSmpIdx, durSmpCnt, kMidiEvtTlId, mfp->obj.seqId, recdByteCnt, &meop)) != kOkTlRC ) + if((rc = _cmTlAllocRecd2(p, NULL, refOp, begSmpIdx-begSmpIdx0, durSmpCnt, kMidiEvtTlId, mfp->obj.seqId, recdByteCnt, &meop)) != kOkTlRC ) goto errLabel; + begSmpIdx0 = begSmpIdx; + assert( meop != NULL ); cmTlMidiEvt_t* mep = _cmTimeLineMidiEvtObjPtr(p,meop->obj); @@ -731,7 +729,7 @@ cmTlRC_t _cmTlAllocMidiFileRecd( _cmTl_t* p, const cmChar_t* nameStr, const cmCh unsigned durSmpCnt = floor(cmMidiFileDurSecs(mfH)*p->srate); // convert the midi file from delta ticks to delta samples - cmMidiFileTickToSamples(mfH,p->srate,false); + //cmMidiFileTickToSamples(mfH,p->srate,false); // assign note durations to all note-on msg's cmMidiFileCalcNoteDurations(mfH); @@ -757,6 +755,7 @@ cmTlRC_t _cmTlAllocMidiFileRecd( _cmTl_t* p, const cmChar_t* nameStr, const cmCh op->obj->text = mp->fn; + // insert the events in the midi file as individual time line objects if((rc = _cmTlProcMidiFile(p, op, mfH)) != kOkTlRC ) goto errLabel; @@ -778,8 +777,6 @@ cmTlRC_t _cmTlAllocMidiFileRecd( _cmTl_t* p, const cmChar_t* nameStr, const cmCh cmTlRC_t _cmTlAllocMarkerRecd( _cmTl_t* p, const cmChar_t* nameStr, const cmChar_t* refIdStr, int begSmpIdx, unsigned durSmpCnt, unsigned seqId, const cmChar_t* text, unsigned bar, const cmChar_t* sectionStr, unsigned markerTypeId, cmTlObj_t* refObjPtr ) { - assert( refObjPtr != NULL ); - cmTlRC_t rc = kOkTlRC; _cmTlObj_t* op = NULL; const cmChar_t* textStr = text==NULL ? "" : text;