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

cmScoreMatchGraphics.c : Added colored output for damper and sostenuto pedal.

Browse Source
This commit is contained in:
kevin 2016-06-22 17:10:03 -04:00
parent 5cde332add
commit 10493545b4
1 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/cmScoreMatchGraphic.c
View File

@ -26,8 +26,9 @@ enum
kBarSmgFl = 0x0002, kBarSmgFl = 0x0002,
kNoteSmgFl = 0x0004, kNoteSmgFl = 0x0004,
kPedalSmgFl = 0x0008, kPedalSmgFl = 0x0008,
kMidiSmgFl = 0x0010, kSostSmgFl = 0x0010,
kNoMatchSmgFl = 0x0020 kMidiSmgFl = 0x0020,
kNoMatchSmgFl = 0x0040
}; };
// Graphic box representing a score label or MIDI event // Graphic box representing a score label or MIDI event
@ -92,7 +93,7 @@ typedef struct
cmErr_t err; cmErr_t err;
cmChar_t* scFn; cmChar_t* scFn;
cmSmgSc_t* scV; // scV[scN] score bars and notes cmSmgSc_t* scV; // scV[scN] score bars,notes, pedals
unsigned scN; unsigned scN;
cmSmgLoc_t* locV; // locV[locN] score locations (from the score file) cmSmgLoc_t* locV; // locV[locN] score locations (from the score file)
@ -240,7 +241,12 @@ cmSmgRC_t _cmSmgInitFromScore( cmCtx_t* ctx, cmSmg_t* p, const cmChar_t* scoreFn
case kPedalEvtScId: case kPedalEvtScId:
flags |= kPedalSmgFl; flags |= kPedalSmgFl;
text = cmTsPrintfP(NULL,"%s", cmIsFlag(e->flags,kPedalDnScFl)?"v":"^"); text = cmTsPrintfP(NULL,"%s", cmIsFlag(e->flags,kPedalDnScFl)?"v":"^");
if( e->pitch == kSostenutoCtlMdId )
flags |= kSostSmgFl;
break; break;
} }
@ -554,6 +560,14 @@ cmSmgRC_t cmScoreMatchGraphicWrite( cmSmgH_t h, const cmChar_t* fn )
if( cmIsFlag(b->flags,kBarSmgFl) ) if( cmIsFlag(b->flags,kBarSmgFl) )
classStr = "bar"; classStr = "bar";
if( cmIsFlag(b->flags,kPedalSmgFl) )
{
if( cmIsFlag(b->flags,kSostSmgFl) )
classStr = "sost";
else
classStr = "damper";
}
if( cmFilePrintf(fH,"<rect x=\"%i\" y=\"%i\" width=\"%i\" height=\"%i\" class=\"%s\"/>\n",b->left,b->top,b->width,b->height,classStr) != kOkFileRC ) if( cmFilePrintf(fH,"<rect x=\"%i\" y=\"%i\" width=\"%i\" height=\"%i\" class=\"%s\"/>\n",b->left,b->top,b->width,b->height,classStr) != kOkFileRC )
return cmErrMsg(&p->err,kFileFailScRC,"File write failed on graphic file rect output."); return cmErrMsg(&p->err,kFileFailScRC,"File write failed on graphic file rect output.");
@ -622,6 +636,25 @@ cmSmgRC_t cmScoreMatchGraphicGenTimeLineBars( cmSmgH_t h, const cmChar_t* fn, un
} }
cmSmRC_t _cmScoreMatchGraphicUpdateSostenuto( cmSmg_t* p, cmMidiFileH_t mfH, cmScH_t scH )
{
unsigned evtN = cmScoreEvtCount(scH);
unsigned i;
const cmScoreEvt_t* e;
const cmScoreEvt_t* e0 = NULL;
for(i=0; i<evtN; ++i)
if( e->type == kNonEvtScId )
if( e->type == kPedalEvtScId && e->pitch == kSostenutoCtlMdId )
{
}
}
cmSmgRC_t cmScoreMatchGraphicUpdateMidiFromScore( cmCtx_t* ctx, cmSmgH_t h, const cmChar_t* newMidiFn ) cmSmgRC_t cmScoreMatchGraphicUpdateMidiFromScore( cmCtx_t* ctx, cmSmgH_t h, const cmChar_t* newMidiFn )
{ {
cmSmgRC_t rc = kOkSmgRC; cmSmgRC_t rc = kOkSmgRC;
@ -629,16 +662,19 @@ cmSmgRC_t cmScoreMatchGraphicUpdateMidiFromScore( cmCtx_t* ctx, cmSmgH_t h, cons
unsigned i = 0; unsigned i = 0;
cmMidiFileH_t mfH = cmMidiFileNullHandle; cmMidiFileH_t mfH = cmMidiFileNullHandle;
cmScH_t scH = cmScNullHandle; cmScH_t scH = cmScNullHandle;
// open the MIDI file
if( cmMidiFileOpen(ctx, &mfH, p->mfFn ) != kOkMfRC ) if( cmMidiFileOpen(ctx, &mfH, p->mfFn ) != kOkMfRC )
return cmErrMsg(&p->err,kMidiFileFailSmgRC,"MIDI file open failed on '%s'.",cmStringNullGuard(p->mfFn)); return cmErrMsg(&p->err,kMidiFileFailSmgRC,"MIDI file open failed on '%s'.",cmStringNullGuard(p->mfFn));
// instantiate the score from the score CSV file
if( cmScoreInitialize(ctx,&scH,p->scFn,44100.0, NULL, 0, NULL, NULL, cmSymTblNullHandle ) != kOkScRC ) if( cmScoreInitialize(ctx,&scH,p->scFn,44100.0, NULL, 0, NULL, NULL, cmSymTblNullHandle ) != kOkScRC )
{ {
rc = cmErrMsg(&p->err,kScoreFailSmgRC,"Score initializatio failed on '%s'.",cmStringNullGuard(p->scFn)); rc = cmErrMsg(&p->err,kScoreFailSmgRC,"Score initializatio failed on '%s'.",cmStringNullGuard(p->scFn));
goto errLabel; goto errLabel;
} }
// for each MIDI note-on event
for(i=0; i<p->mN; ++i) for(i=0; i<p->mN; ++i)
{ {
cmSmgMidi_t* mr = p->mV + i; cmSmgMidi_t* mr = p->mV + i;
@ -651,7 +687,7 @@ cmSmgRC_t cmScoreMatchGraphicUpdateMidiFromScore( cmCtx_t* ctx, cmSmgH_t h, cons
const cmScoreEvt_t* s= cmScoreIdToEvt( scH, mr->matchV->score->csvEventId ); const cmScoreEvt_t* s= cmScoreIdToEvt( scH, mr->matchV->score->csvEventId );
assert( s!=NULL ); assert( s!=NULL );
// assign the score velocity to the MIDI file // assign the score velocity to the MIDI note
if(cmMidiFileSetVelocity( mfH, mr->uid, s->vel ) != kOkMfRC ) if(cmMidiFileSetVelocity( mfH, mr->uid, s->vel ) != kOkMfRC )
{ {
rc = cmErrMsg(&p->err,kOpFailSmgRC,"Set velocify operation failed."); rc = cmErrMsg(&p->err,kOpFailSmgRC,"Set velocify operation failed.");