cwScoreFollower.cpp : The file output from write_sync_perf_csv() now includes the section which each matched event belongs to.

This commit is contained in:
kevin 2024-02-08 11:09:40 -05:00
parent 36496e8b79
commit ab2bb493d1

View File

@ -638,9 +638,10 @@ cw::rc_t cw::score_follower::write_sync_perf_csv( handle_t h, const char* out_fn
if( midi::isNoteOn(m->status,d1) ) if( midi::isNoteOn(m->status,d1) )
{ {
unsigned bar = 0; unsigned bar = 0;
unsigned loc = score_parse::kInvalidLocId; const char* sectionLabel = "";
unsigned dlevel = -1; unsigned loc = score_parse::kInvalidLocId;
unsigned dlevel = -1;
char sciPitch[ midi::kMidiSciPitchCharCnt + 1 ]; char sciPitch[ midi::kMidiSciPitchCharCnt + 1 ];
midi::midiToSciPitch( d0, sciPitch, midi::kMidiSciPitchCharCnt ); midi::midiToSciPitch( d0, sciPitch, midi::kMidiSciPitchCharCnt );
@ -664,18 +665,19 @@ cw::rc_t cw::score_follower::write_sync_perf_csv( handle_t h, const char* out_fn
goto errLabel; goto errLabel;
} }
bar = e->barNumb; bar = e->barNumb;
curBarNumb = std::max(bar,curBarNumb); sectionLabel = e->section != nullptr ? e->section->label : "";
dlevel = e->dynLevel; curBarNumb = std::max(bar,curBarNumb);
loc = resultA[i].oLocId == kInvalidId ? score_parse::kInvalidLocId : resultA[i].oLocId; dlevel = e->dynLevel;
loc = resultA[i].oLocId == kInvalidId ? score_parse::kInvalidLocId : resultA[i].oLocId;
break; break;
} }
} }
rc = file::printf(fH, "%i,%i,%i,%i,0,%f,0.0,0.0,0,%s,,%i,%i,%i,%i,,,,,%i,%i,%i\n", rc = file::printf(fH, "%i,%i,%i,%i,0,%f,0.0,0.0,0,%s,,%i,%i,%i,%i,,%s,,,%i,%i,%i\n",
bar,i,1,loc,secs,sciPitch,dlevel,m->status,d0,d1,dampPedalDownFl,softPedalDownFl,sostPedalDownFl); bar,i,1,loc,secs,sciPitch,dlevel,m->status,d0,d1,sectionLabel,dampPedalDownFl,softPedalDownFl,sostPedalDownFl);
} }
else else
{ {