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

cmScore.h/c:Added score file line number to cmScoreEvt_t.

Browse Source
This commit is contained in:
kpl 2013-07-09 14:04:40 -07:00
parent a14aaf21e5
commit e54b4da348
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/cmScore.c
View File

@ -980,6 +980,9 @@ cmScRC_t _cmScParseFile( cmSc_t* p, cmCtx_t* ctx, const cmChar_t* fn )
break; break;
} }
// set the score file line number
p->array[j].line = i + 1;
secs = DBL_MAX; secs = DBL_MAX;
switch(tid) switch(tid)
@ -1236,7 +1239,7 @@ cmScoreEvt_t* cmScoreBarEvt( cmScH_t h, unsigned barNumb )
cmSc_t* p = _cmScHandleToPtr(h); cmSc_t* p = _cmScHandleToPtr(h);
unsigned i = 0; unsigned i = 0;
for(; i<p->cnt; ++i) for(; i<p->cnt; ++i)
if( p->array[i].typeId==kBarEvtScId && p->array[i].barNumb==barNumb ) if( p->array[i].type==kBarEvtScId && p->array[i].barNumb==barNumb )
return p->array + i; return p->array + i;
return NULL; return NULL;
@ -1905,18 +1908,26 @@ void cmScorePrint( cmScH_t h, cmRpt_t* rpt )
{ {
cmSc_t* p = _cmScHandleToPtr(h); cmSc_t* p = _cmScHandleToPtr(h);
unsigned i; unsigned i;
for(i=0; i<20 /*p->cnt*/; ++i) for(i=0; i<p->cnt; ++i)
{ {
cmScoreEvt_t* r = p->array + i; cmScoreEvt_t* r = p->array + i;
switch(r->type) switch(r->type)
{ {
case kNonEvtScId: case kBarEvtScId:
cmRptPrintf(rpt,"%5i %3i %3i %s 0x%2x %c%c%c %s\n", cmRptPrintf(rpt,"%5i %5i %3i bar\n",
i, i,
r->line,
r->barNumb );
break;
case kNonEvtScId:
cmRptPrintf(rpt,"%5i %5i %3i %3i %s %5s %c%c%c %s\n",
i,
r->line,
r->barNumb, r->barNumb,
r->barNoteIdx, r->barNoteIdx,
cmScEvtTypeIdToLabel(r->type), cmScEvtTypeIdToLabel(r->type),
r->pitch, cmMidiToSciPitch(r->pitch,NULL,0),
cmIsFlag(r->flags,kEvenScFl) ? 'e' : ' ', cmIsFlag(r->flags,kEvenScFl) ? 'e' : ' ',
cmIsFlag(r->flags,kTempoScFl) ? 't' : ' ', cmIsFlag(r->flags,kTempoScFl) ? 't' : ' ',
cmIsFlag(r->flags,kDynScFl) ? 'd' : ' ', cmIsFlag(r->flags,kDynScFl) ? 'd' : ' ',

3
app/cmScore.h
View File

@ -87,6 +87,7 @@ extern "C" {
unsigned perfSmpIdx; // Time this event was performed or cmInvalidIdx if the event was not performed. unsigned perfSmpIdx; // Time this event was performed or cmInvalidIdx if the event was not performed.
unsigned perfVel; // Velocity of the performed note or 0 if the note was not performed. 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 perfDynLvl; // Index into dynamic level ref. array assoc'd with perfVel
unsigned line; // Line number of this event in the score file.
} cmScoreEvt_t; } cmScoreEvt_t;
typedef struct cmScoreSet_str typedef struct cmScoreSet_str
@ -175,7 +176,6 @@ extern "C" {
// cmScMsg_t record. // cmScMsg_t record.
cmScRC_t cmScoreSeqNotify( cmScH_t h ); cmScRC_t cmScoreSeqNotify( cmScH_t h );
/*
void cmScoreClearPerfInfo( cmScH_t h ); void cmScoreClearPerfInfo( cmScH_t h );
// Assign 'smpIdx' and 'vel' to the event matching 'pitch' at 'locIdx' // Assign 'smpIdx' and 'vel' to the event matching 'pitch' at 'locIdx'
@ -193,7 +193,6 @@ extern "C" {
// Set the performed dynamic level of a score event. // Set the performed dynamic level of a score event.
void cmScoreSetPerfDynLevel( cmScH_t h, unsigned evtIdx, unsigned dynLvl ); void cmScoreSetPerfDynLevel( cmScH_t h, unsigned evtIdx, unsigned dynLvl );
*/
typedef enum typedef enum
{ {