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

cmXScore.c : The tempo and dynamic marking columns must be stored as quoted text so that the section numbers can be correctly parsed by cmScore.

Browse Source
This commit is contained in:
Kevin Larke 2016-04-23 16:06:54 -04:00
parent 15ee5423c9
commit c169faa083
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/cmXScore.c
View File

@ -1898,7 +1898,7 @@ cmXsRC_t _cmXScoreWriteCsvRow(
} }
// col 17: tempo // col 17: tempo
if( cmCsvInsertIdentColAfter(p->csvH,lcp,&lcp,tempoStr,0) != kOkCsvRC ) if( cmCsvInsertQTextColAfter(p->csvH,lcp,&lcp,tempoStr,0) != kOkCsvRC )
{ {
rc = cmErrMsg(&p->err,kCsvFailXsRC,"CSV insert failed on eveness flag label."); rc = cmErrMsg(&p->err,kCsvFailXsRC,"CSV insert failed on eveness flag label.");
goto errLabel; goto errLabel;
@ -1920,7 +1920,7 @@ cmXsRC_t _cmXScoreWriteCsvRow(
} }
// col 19: dynamic marking // col 19: dynamic marking
if( cmCsvInsertIdentColAfter(p->csvH, lcp, &lcp, dynStr, 0 ) != kOkCsvRC ) if( cmCsvInsertQTextColAfter(p->csvH, lcp, &lcp, dynStr, 0 ) != kOkCsvRC )
{ {
rc = cmErrMsg(&p->err,kCsvFailXsRC,"CSV insert failed on 'dynamics'."); rc = cmErrMsg(&p->err,kCsvFailXsRC,"CSV insert failed on 'dynamics'.");
goto errLabel; goto errLabel;
@ -2179,7 +2179,13 @@ cmXsRC_t cmXScoreWriteMidi( cmXsH_t h, const cmChar_t* fn )
} }
} }
cmXsRC_t cmXScoreTest( cmCtx_t* ctx, const cmChar_t* xmlFn, const cmChar_t* midiFn, const cmChar_t* outFn, const cmChar_t* dynFn, const cmChar_t* reorderFn ) cmXsRC_t cmXScoreTest(
cmCtx_t* ctx,
const cmChar_t* xmlFn,
const cmChar_t* midiFn,
const cmChar_t* outFn,
const cmChar_t* dynFn,
const cmChar_t* reorderFn )
{ {
cmXsRC_t rc; cmXsRC_t rc;
cmXsH_t h = cmXsNullHandle; cmXsH_t h = cmXsNullHandle;
@ -2196,15 +2202,23 @@ cmXsRC_t cmXScoreTest( cmCtx_t* ctx, const cmChar_t* xmlFn, const cmChar_t* midi
if( outFn != NULL ) if( outFn != NULL )
{ {
cmScH_t scH = cmScNullHandle; cmScH_t scH = cmScNullHandle;
double srate = 96000.0; double srate = 44100.0;
cmXScoreWriteCsv(h,outFn); cmXScoreWriteCsv(h,outFn);
cmSymTblH_t stH = cmSymTblCreate(cmSymTblNullHandle, 0, ctx );
if( cmScoreInitialize( ctx, &scH, outFn, srate, NULL, 0, NULL, NULL, cmSymTblNullHandle) != kOkScRC ) if( cmScoreInitialize( ctx, &scH, outFn, srate, NULL, 0, NULL, NULL, stH) != kOkScRC )
cmErrMsg(&ctx->err,kFileFailXsRC,"The generated CSV file could not be parsed."); cmErrMsg(&ctx->err,kFileFailXsRC,"The generated CSV file could not be parsed.");
else else
{
cmScorePrintSets(scH,&ctx->rpt);
cmScoreFinalize(&scH); cmScoreFinalize(&scH);
}
cmSymTblDestroy(&stH);
} }