From 63fff58dd862e7873cd303340d890e5f8b117211 Mon Sep 17 00:00:00 2001
From: kevin <kevin@Currawong.local>
Date: Wed, 2 Mar 2016 18:51:51 -0500
Subject: [PATCH] cmScore.h/c : Added csvEventId to hold the CSV file 'evt'
 column value.

---
 app/cmScore.c | 15 ++++++++++-----
 app/cmScore.h |  1 +
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/cmScore.c b/app/cmScore.c
index ab2b8ca..c883796 100644
--- a/app/cmScore.c
+++ b/app/cmScore.c
@@ -31,7 +31,8 @@ enum
 
 enum
 {
-  kMidiFileIdColScIdx= 0,  
+  kMidiFileIdColScIdx= 0,
+  kEventIdColScIdx   = 2,
   kTypeLabelColScIdx = 3,
   kDSecsColScIdx     = 4,
   kSecsColScIdx      = 5,
@@ -723,10 +724,13 @@ cmScRC_t _cmScParseNoteOn( cmSc_t* p, unsigned rowIdx, cmScoreEvt_t* s, unsigned
   const cmChar_t* attr;
   double          secs;
   double          durSecs;
+  unsigned        eventId;
   const cmCsvCell_t* cell;
 
   s += scoreIdx;
 
+  eventId = cmCsvCellUInt(p->cH,rowIdx,kEventIdColScIdx);  
+
   // verify the scientific pitch cell was formatted correcly  
   if((cell = cmCsvCellPtr(p->cH,rowIdx,kPitchColScIdx)) == NULL || cell->lexTId != p->sciPitchLexTId )
     return cmErrMsg(&p->err,kSyntaxErrScRC,"Pitch column format error.");
@@ -736,7 +740,7 @@ cmScRC_t _cmScParseNoteOn( cmSc_t* p, unsigned rowIdx, cmScoreEvt_t* s, unsigned
           
   if((midiPitch = cmSciPitchToMidi(sciPitch)) == kInvalidMidiPitch)
     return cmErrMsg(&p->err,kSyntaxErrScRC,"Unable to convert the scientific pitch '%s' to a MIDI value. ");
-
+  
   // get the sec's field - or DBL_MAX if it is not set
   if((secs =  cmCsvCellDouble(p->cH, rowIdx, kSecsColScIdx )) == DBL_MAX) // Returns DBL_MAX on error.
     flags += kInvalidScFl;
@@ -812,6 +816,7 @@ cmScRC_t _cmScParseNoteOn( cmSc_t* p, unsigned rowIdx, cmScoreEvt_t* s, unsigned
   s->barNoteIdx = barNoteIdx;
   s->durSecs    = durSecs;
   s->csvRowNumb = rowIdx+1;
+  s->csvEventId = eventId;
   return rc;
 }
 
@@ -2451,7 +2456,7 @@ cmScRC_t      cmScoreFileFromMidi( cmCtx_t* ctx, const cmChar_t* midiFn, const c
 
   for(i=1; titles[i]!=NULL; ++i)
   {
-    if( cmCsvInsertTextColAfter(csvH, cp, &cp, titles[i], lexTId ) != kOkCsvRC )
+    if( cmCsvInsertIdentColAfter(csvH, cp, &cp, titles[i], lexTId ) != kOkCsvRC )
     {
       cmErrMsg(&err,kCsvFailScRC,"Error inserting column index '%i' label in '%s'.",i,cmStringNullGuard(scoreFn));
       goto errLabel;
@@ -2521,7 +2526,7 @@ cmScRC_t      cmScoreFileFromMidi( cmCtx_t* ctx, const cmChar_t* midiFn, const c
       goto errLabel;
     }
 
-    if( cmCsvInsertTextColAfter(csvH, cp, &cp, opStr, lexTId ) != kOkCsvRC )
+    if( cmCsvInsertQTextColAfter(csvH, cp, &cp, opStr, lexTId ) != kOkCsvRC )
     {
       cmErrMsg(&err,kCsvFailScRC,"Error inserting 'opcode' column in '%s'.",cmStringNullGuard(scoreFn));
       goto errLabel;
@@ -2572,7 +2577,7 @@ cmScRC_t      cmScoreFileFromMidi( cmCtx_t* ctx, const cmChar_t* midiFn, const c
     switch( tmp->status )
     {
       case kNoteOnMdId:
-        if( cmCsvInsertTextColAfter(csvH, cp, &cp, cmMidiToSciPitch(tmp->u.chMsgPtr->d0,NULL,0), lexTId ) != kOkCsvRC )
+        if( cmCsvInsertQTextColAfter(csvH, cp, &cp, cmMidiToSciPitch(tmp->u.chMsgPtr->d0,NULL,0), lexTId ) != kOkCsvRC )
         {
           cmErrMsg(&err,kCsvFailScRC,"Error inserting 'opcode' column in '%s'.",cmStringNullGuard(scoreFn));
           goto errLabel;
diff --git a/app/cmScore.h b/app/cmScore.h
index 1f96ade..1af3d50 100644
--- a/app/cmScore.h
+++ b/app/cmScore.h
@@ -96,6 +96,7 @@ extern "C" {
     unsigned     perfVel;      // Velocity of the performed note or 0 if the note was not performed.
     unsigned     perfDynLvl;   // Index into dynamic level ref. array assoc'd with perfVel  
     unsigned     line;         // Line number of this event in the score file.
+    unsigned     csvEventId;   // EventId from CSV 'evt' column.
   } cmScoreEvt_t;
 
   // A 'set' is a collection of events that are grouped in time and all marked with a given attribute.