cml/libcw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cwSfMatch.h/cpp : Updates to support call to test() from score_test.

Browse Source
This commit is contained in:
kevin 2023-08-20 17:12:58 -04:00
parent 722c845187
commit f27124a09a
2 changed files with 14 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
cwSfMatch.cpp
View File

@ -6,6 +6,8 @@
#include "cwObject.h" #include "cwObject.h"
#include "cwMidi.h" #include "cwMidi.h"
#include "cwFileSys.h" #include "cwFileSys.h"
#include "cwDynRefTbl.h"
#include "cwScoreParse.h"
#include "cwSfScore.h" #include "cwSfScore.h"
#include "cwSfMatch.h" #include "cwSfMatch.h"
@ -49,7 +51,7 @@ namespace cw
// count the number of note events at location li // count the number of note events at location li
for(n=0,i=0; i<lp->evtCnt; ++i) for(n=0,i=0; i<lp->evtCnt; ++i)
if( lp->evtArray[i]->type == sfscore::kNonEvtScId ) if( lp->evtArray[i]->type == score_parse::kNoteOnTId )
++n; ++n;
assert( ei+n <= p->locN ); assert( ei+n <= p->locN );
@ -65,7 +67,7 @@ namespace cw
p->loc[ei+i].barNumb = lp->barNumb; p->loc[ei+i].barNumb = lp->barNumb;
for(j=0,k=0; j<lp->evtCnt; ++j) for(j=0,k=0; j<lp->evtCnt; ++j)
if( lp->evtArray[j]->type == sfscore::kNonEvtScId ) if( lp->evtArray[j]->type == score_parse::kNoteOnTId )
{ {
p->loc[ei+i].evtV[k].pitch = lp->evtArray[j]->pitch; p->loc[ei+i].evtV[k].pitch = lp->evtArray[j]->pitch;
p->loc[ei+i].evtV[k].scEvtIdx = lp->evtArray[j]->index; p->loc[ei+i].evtV[k].scEvtIdx = lp->evtArray[j]->index;
@ -415,17 +417,17 @@ namespace cw
s[0] = 0; s[0] = 0;
if( cwIsFlag(ep->flags,sfscore::kEvenScFl) ) if( cwIsFlag(ep->flags,score_parse::kEvenVarFl) )
s[i++] = 'e'; s[i++] = 'e';
if( cwIsFlag(ep->flags,sfscore::kTempoScFl) ) if( cwIsFlag(ep->flags,score_parse::kTempoVarFl) )
s[i++] = 't'; s[i++] = 't';
if( cwIsFlag(ep->flags,sfscore::kDynScFl) ) if( cwIsFlag(ep->flags,score_parse::kDynVarFl) )
s[i++] = 'd'; s[i++] = 'd';
if( cwIsFlag(ep->flags,sfscore::kGraceScFl) ) //if( cwIsFlag(ep->flags,sfscore::kGraceScFl) )
s[i++] = 'g'; // s[i++] = 'g';
s[i++] = 0; s[i++] = 0;
@ -777,14 +779,9 @@ void cw::sfmatch::print_path( handle_t h, unsigned bsi, const midi_t* midiV )
} }
cw::rc_t cw::sfmatch::test( const object_t* cfg ) cw::rc_t cw::sfmatch::test( const object_t* cfg, sfscore::handle_t scoreH )
{ {
rc_t rc = kOkRC; rc_t rc = kOkRC;
const char* score_csv_fname = nullptr;
sfscore::dyn_ref_t* dynRefA = nullptr;
unsigned dynRefN = 0;;
double srate = 48000.0;
const object_t* dynArrayNode = nullptr;
const object_t* perf = nullptr; const object_t* perf = nullptr;
const object_t* gen_perf_example = nullptr; const object_t* gen_perf_example = nullptr;
bool gen_perf_enable_fl = false; bool gen_perf_enable_fl = false;
@ -793,14 +790,10 @@ cw::rc_t cw::sfmatch::test( const object_t* cfg )
midi_t* midiA = nullptr; midi_t* midiA = nullptr;
unsigned maxScWndN = 10; unsigned maxScWndN = 10;
unsigned maxMidiWndN = 7; unsigned maxMidiWndN = 7;
sfscore::handle_t scoreH;
sfmatch::handle_t matchH; sfmatch::handle_t matchH;
// parse the test cfg // parse the test cfg
if((rc = cfg->getv( "cm_score_fname", score_csv_fname, if((rc = cfg->getv( "maxScWndN", maxScWndN,
"srate", srate,
"dyn_ref", dynArrayNode,
"maxScWndN", maxScWndN,
"maxMidiWndN", maxMidiWndN, "maxMidiWndN", maxMidiWndN,
"gen_perf_example", gen_perf_example, "gen_perf_example", gen_perf_example,
"perf", perf)) != kOkRC ) "perf", perf)) != kOkRC )
@ -817,21 +810,9 @@ cw::rc_t cw::sfmatch::test( const object_t* cfg )
goto errLabel; goto errLabel;
} }
if((rc = sfscore::parse_dyn_ref_cfg( dynArrayNode, dynRefA, dynRefN )) != kOkRC )
{
rc = cwLogError(rc,"The reference dynamics array parse failed.");
goto errLabel;
}
if((rc = sfscore::create(scoreH,score_csv_fname,srate,dynRefA,dynRefN)) != kOkRC )
{
rc = cwLogError(rc,"Score test create failed.");
goto errLabel;
}
if( gen_perf_enable_fl ) if( gen_perf_enable_fl )
{ {
_gen_match_test_input_from_score( scoreH, gen_perf_beg_loc_idx, gen_perf_loc_cnt, srate ); _gen_match_test_input_from_score( scoreH, gen_perf_beg_loc_idx, gen_perf_loc_cnt, sample_rate(scoreH) );
} }
else else
{ {
@ -885,9 +866,7 @@ cw::rc_t cw::sfmatch::test( const object_t* cfg )
} }
errLabel: errLabel:
sfmatch::destroy(matchH); destroy(matchH);
sfscore::destroy(scoreH);
mem::release(dynRefA);
mem::release(midiA); mem::release(midiA);
return rc; return rc;

2
cwSfMatch.h
View File

@ -171,7 +171,7 @@ namespace cw
inline const cw::sfmatch::path_t* optimal_path( handle_t h ) { return handleToPtr<handle_t,sfmatch_t>(h)->p_opt; } inline const cw::sfmatch::path_t* optimal_path( handle_t h ) { return handleToPtr<handle_t,sfmatch_t>(h)->p_opt; }
rc_t test( const object_t* cfg ); rc_t test( const object_t* cfg, sfscore::handle_t scoreH );
} }
} }