Browse Source

cmScoreProc.c : Initial support for sending the MIDI file msg unique id to the

score tracker.
master
Kevin Larke 9 years ago
parent
commit
80b094d205
1 changed files with 5 additions and 3 deletions
  1. 5
    3
      app/cmScoreProc.c

+ 5
- 3
app/cmScoreProc.c View File

@@ -229,7 +229,7 @@ cmSpRC_t _cmScoreProcProcess(cmCtx_t* ctx, cmSp_t* sp)
229 229
         {
230 230
           sp->procCb( sp->cbArg, sp, kNoteOnSpId,  o1p );
231 231
 
232
-          cmRC_t cmRC = cmScMatcherExec(sp->match, mep->obj.seqSmpIdx, mep->msg->status, mep->msg->u.chMsgPtr->d0, mep->msg->u.chMsgPtr->d1, NULL );
232
+          cmRC_t cmRC = cmScMatcherExec(sp->match, mep->obj.seqSmpIdx, mep->msg->uid, mep->msg->status, mep->msg->u.chMsgPtr->d0, mep->msg->u.chMsgPtr->d1, NULL );
233 233
 
234 234
           switch( cmRC )
235 235
           {
@@ -584,7 +584,8 @@ typedef struct cmSpAssoc_str
584 584
 typedef struct cmSpNoteMap_str
585 585
 {
586 586
   unsigned                tlUid; // time-line MIDI note-on object id
587
-  unsigned                mni;  // assocated 'mni' returned in a cmScMatcherResult_t record
587
+  unsigned                mni;   // assocated 'mni' returned in a cmScMatcherResult_t record
588
+  unsigned                muid;  // MIDI file msg unique id for this event (see cmMidiTrackMsg_t.uid)
588 589
   struct cmSpNoteMap_str* link;
589 590
 } cmSpNoteMap_t;
590 591
 
@@ -613,6 +614,7 @@ void _cmSpMatchAssocCb( cmScMatcher* p, void* arg, cmScMatcherResult_t* rp )
613 614
   
614 615
   if( cmJsonCreateFilledObject(m->jsH, m->array,
615 616
       "mni",      kIntTId, rp->mni,
617
+      "muid",     kIntTId, rp->muid,
616 618
       "scEvtIdx", kIntTId, rp->scEvtIdx,
617 619
       "flags",    kIntTId, rp->flags, 
618 620
       NULL ) == NULL )
@@ -719,7 +721,7 @@ cmSpRC_t  _cmSpProcAssocCb( void* arg, cmSp_t* sp, cmScoreProcSelId_t id, cmTlOb
719 721
 cmSpRC_t _cmScoreProcGenAssocMain(cmCtx_t* ctx)
720 722
 {
721 723
   const cmChar_t*  rsrcFn = "/home/kevin/.kc/time_line.js";
722
-  const cmChar_t*  outFn  = "/home/kevin/src/cmkc/src/kc/data/assoc0.js";
724
+  const cmChar_t*  outFn  = "/home/kevin/src/cmkc/src/kc/data/takeSeqBldr0.js";
723 725
   cmSpRC_t         rc     = kOkSpRC;
724 726
   cmSpAssocProc_t* m      = cmMemAllocZ(cmSpAssocProc_t,1);
725 727
   cmSp_t           s;

Loading…
Cancel
Save