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
         {
229
         {
230
           sp->procCb( sp->cbArg, sp, kNoteOnSpId,  o1p );
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
           switch( cmRC )
234
           switch( cmRC )
235
           {
235
           {
584
 typedef struct cmSpNoteMap_str
584
 typedef struct cmSpNoteMap_str
585
 {
585
 {
586
   unsigned                tlUid; // time-line MIDI note-on object id
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
   struct cmSpNoteMap_str* link;
589
   struct cmSpNoteMap_str* link;
589
 } cmSpNoteMap_t;
590
 } cmSpNoteMap_t;
590
 
591
 
613
   
614
   
614
   if( cmJsonCreateFilledObject(m->jsH, m->array,
615
   if( cmJsonCreateFilledObject(m->jsH, m->array,
615
       "mni",      kIntTId, rp->mni,
616
       "mni",      kIntTId, rp->mni,
617
+      "muid",     kIntTId, rp->muid,
616
       "scEvtIdx", kIntTId, rp->scEvtIdx,
618
       "scEvtIdx", kIntTId, rp->scEvtIdx,
617
       "flags",    kIntTId, rp->flags, 
619
       "flags",    kIntTId, rp->flags, 
618
       NULL ) == NULL )
620
       NULL ) == NULL )
719
 cmSpRC_t _cmScoreProcGenAssocMain(cmCtx_t* ctx)
721
 cmSpRC_t _cmScoreProcGenAssocMain(cmCtx_t* ctx)
720
 {
722
 {
721
   const cmChar_t*  rsrcFn = "/home/kevin/.kc/time_line.js";
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
   cmSpRC_t         rc     = kOkSpRC;
725
   cmSpRC_t         rc     = kOkSpRC;
724
   cmSpAssocProc_t* m      = cmMemAllocZ(cmSpAssocProc_t,1);
726
   cmSpAssocProc_t* m      = cmMemAllocZ(cmSpAssocProc_t,1);
725
   cmSp_t           s;
727
   cmSp_t           s;

Loading…
Cancel
Save