|
@@ -151,10 +151,11 @@ cmMsfRC_t cmMidiScoreFollowMain( cmCtx_t* ctx )
|
151
|
151
|
{
|
152
|
152
|
cmMsfRC_t rc = kOkMsfRC;
|
153
|
153
|
//const cmChar_t* scoreFn = cmFsMakeUserFn("src/kc/src/kc/data","mod2e","csv",NULL);
|
154
|
|
- const cmChar_t* scoreFn = cmFsMakeUserFn("temp","a5","csv",NULL);
|
|
154
|
+ const cmChar_t* scoreFn = cmFsMakeUserFn("temp","a6","csv",NULL);
|
155
|
155
|
const cmChar_t* midiFn = cmFsMakeUserFn("media/projects/imag_themes/scores/gen","round1-utf8_11","mid",NULL);
|
156
|
156
|
const cmChar_t* outFn = cmFsMakeUserFn("temp","match","txt",NULL);
|
157
|
157
|
const cmChar_t* svgFn = cmFsMakeUserFn("temp","score0","html",NULL);
|
|
158
|
+ const cmChar_t* newMidiFn= cmFsMakeUserFn("temp","a6","mid",NULL);
|
158
|
159
|
const cmChar_t* tlBarFn = cmFsMakeUserFn("temp",NULL,"time_line_temp","txt",NULL);
|
159
|
160
|
|
160
|
161
|
double srate = 96000.0;
|
|
@@ -262,8 +263,8 @@ cmMsfRC_t cmMidiScoreFollowMain( cmCtx_t* ctx )
|
262
|
263
|
|
263
|
264
|
//_cmMsf_ReportMidiErrors(&sfr, scH, m, mN);
|
264
|
265
|
|
265
|
|
- //cmScorePrint(scH,&atc->ctx->rpt);
|
266
|
|
- //cmMidiFilePrintMsgs( mfH, &atc->ctx->rpt );
|
|
266
|
+ //cmScorePrint(scH,&ctx->rpt);
|
|
267
|
+ //cmMidiFilePrintMsgs( mfH, &ctx->rpt );
|
267
|
268
|
|
268
|
269
|
// write the tracking match file as an SVG file.
|
269
|
270
|
cmScoreMatchGraphicWrite( smgH, svgFn );
|
|
@@ -271,6 +272,8 @@ cmMsfRC_t cmMidiScoreFollowMain( cmCtx_t* ctx )
|
271
|
272
|
// write a cmTimeLine file which contains markers at each bar position
|
272
|
273
|
//cmScoreMatchGraphicGenTimeLineBars(smgH, tlBarFn, srate );
|
273
|
274
|
|
|
275
|
+ cmScoreMatchGraphicUpdateMidiFromScore( ctx, smgH, newMidiFn );
|
|
276
|
+
|
274
|
277
|
|
275
|
278
|
errLabel:
|
276
|
279
|
|
|
@@ -287,6 +290,7 @@ cmMsfRC_t cmMidiScoreFollowMain( cmCtx_t* ctx )
|
287
|
290
|
cmFsFreeFn(midiFn);
|
288
|
291
|
cmFsFreeFn(outFn);
|
289
|
292
|
cmFsFreeFn(svgFn);
|
|
293
|
+ cmFsFreeFn(newMidiFn);
|
290
|
294
|
cmFsFreeFn(tlBarFn);
|
291
|
295
|
|
292
|
296
|
return rc;
|