cwScoreFollow.h/cpp : Added initial implementation of write_svg_file(), score_report(), and midi_state_rt_report().
This commit is contained in:
parent
06d985f271
commit
cd65c8f98e
@ -10,6 +10,7 @@
|
||||
#include "cwMidiFile.h"
|
||||
#include "cwCmInterface.h"
|
||||
#include "cwScoreFollower.h"
|
||||
#include "cwMidiState.h"
|
||||
|
||||
#include "cmGlobal.h"
|
||||
#include "cmFloatTypes.h"
|
||||
@ -29,17 +30,21 @@
|
||||
#include "cmProcObj.h"
|
||||
#include "cmProc4.h"
|
||||
|
||||
#include "cwSvgScoreFollow.h"
|
||||
|
||||
namespace cw
|
||||
{
|
||||
namespace score_follower
|
||||
{
|
||||
|
||||
|
||||
typedef struct score_follower_str
|
||||
{
|
||||
double srate;
|
||||
unsigned search_area_locN;
|
||||
unsigned key_wnd_locN;
|
||||
char* score_csv_fname;
|
||||
cmCtx_t* cmCtx;
|
||||
cmScH_t cmScoreH;
|
||||
cmScMatcher* matcher;
|
||||
|
||||
@ -52,6 +57,11 @@ namespace cw
|
||||
unsigned* match_idA;
|
||||
unsigned match_id_allocN;
|
||||
unsigned match_id_curN;
|
||||
|
||||
ssf_note_on_t* perfA;
|
||||
unsigned perfN;
|
||||
unsigned perf_idx;
|
||||
|
||||
} score_follower_t;
|
||||
|
||||
score_follower_t* _handleToPtr( handle_t h )
|
||||
@ -157,11 +167,28 @@ namespace cw
|
||||
return rc;
|
||||
}
|
||||
|
||||
rc_t _update_midi_state( score_follower_t* p, midi_state::handle_t msH )
|
||||
{
|
||||
rc_t rc;
|
||||
for(unsigned i=0; i<p->perf_idx; ++i)
|
||||
{
|
||||
if((rc = setMidiMsg( msH, p->perfA[i].sec, i, 0, midi::kNoteOnMdId, p->perfA[i].pitch, p->perfA[i].vel )) != kOkRC )
|
||||
{
|
||||
rc = cwLogError(rc,"midi_state update failed.");
|
||||
goto errLabel;
|
||||
}
|
||||
}
|
||||
|
||||
errLabel:
|
||||
return rc;
|
||||
}
|
||||
|
||||
rc_t _destroy( score_follower_t* p)
|
||||
{
|
||||
mem::release(p->cmLocToCwLocA);
|
||||
mem::release(p->cwLocToCmLocA);
|
||||
mem::release(p->score_csv_fname);
|
||||
mem::release(p->perfA);
|
||||
cmScMatcherFree(&p->matcher);
|
||||
cmScoreFinalize(&p->cmScoreH);
|
||||
mem::release(p);
|
||||
@ -210,8 +237,6 @@ namespace cw
|
||||
cw::rc_t cw::score_follower::create( handle_t& hRef, const object_t* cfg, cm::handle_t cmCtxH, double srate )
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
cmCtx_t* cmCtx = context(cmCtxH);
|
||||
cmProcCtx* cmProcCtx = proc_context(cmCtxH);
|
||||
cmSymTblH_t cmSymTblH = cmSTATIC_NULL_HANDLE;
|
||||
cmScRC_t scoreRC = cmOkRC;
|
||||
|
||||
@ -220,18 +245,20 @@ cw::rc_t cw::score_follower::create( handle_t& hRef, const object_t* cfg, cm::ha
|
||||
|
||||
score_follower_t* p = mem::allocZ<score_follower_t>();
|
||||
|
||||
p->cmCtx = context(cmCtxH);
|
||||
|
||||
if((rc = _parse_cfg(p,cfg)) != kOkRC )
|
||||
goto errLabel;
|
||||
|
||||
// create the the score follower reference score
|
||||
if((scoreRC = cmScoreInitialize( cmCtx, &p->cmScoreH, p->score_csv_fname, srate, nullptr, 0, nullptr, nullptr, cmSymTblH )) != cmOkRC )
|
||||
if((scoreRC = cmScoreInitialize( p->cmCtx, &p->cmScoreH, p->score_csv_fname, srate, nullptr, 0, nullptr, nullptr, cmSymTblH )) != cmOkRC )
|
||||
{
|
||||
cwLogError(kOpFailRC,"The score could not be initialized from '%s'. cmRC:%i.",p->score_csv_fname);
|
||||
goto errLabel;
|
||||
}
|
||||
|
||||
// create the score follower
|
||||
if((p->matcher = cmScMatcherAlloc( cmProcCtx, // Program context.
|
||||
if((p->matcher = cmScMatcherAlloc( proc_context(cmCtxH), // Program context.
|
||||
nullptr, // Existing cmScMatcher to reallocate or NULL to allocate a new cmScMatcher.
|
||||
srate, // System sample rate.
|
||||
p->cmScoreH, // Score handle. See cmScore.h.
|
||||
@ -262,6 +289,10 @@ cw::rc_t cw::score_follower::create( handle_t& hRef, const object_t* cfg, cm::ha
|
||||
p->match_id_allocN = cmScoreEvtCount( p->cmScoreH )*2; // give plenty of extra space for the match_idA[]
|
||||
p->match_idA = mem::allocZ<unsigned>(p->match_id_allocN);
|
||||
|
||||
p->perfN = cmScoreEvtCount(p->cmScoreH)*2;
|
||||
p->perfA = mem::allocZ<ssf_note_on_t>( p->perfN );
|
||||
p->perf_idx = 0;
|
||||
|
||||
hRef.set(p);
|
||||
|
||||
|
||||
@ -308,18 +339,22 @@ cw::rc_t cw::score_follower::reset( handle_t h, unsigned cwLocId )
|
||||
goto errLabel;
|
||||
}
|
||||
|
||||
printf("SF Reset: cw:%i cm:%i\n",cwLocId,cmLocId);
|
||||
|
||||
if((cmRC = cmScMatcherReset( p->matcher, cmLocId )) != cmOkRC )
|
||||
{
|
||||
rc = cwLogError(kOpFailRC,"The score follower reset failed.");
|
||||
goto errLabel;
|
||||
}
|
||||
|
||||
p->perf_idx = 0;
|
||||
}
|
||||
|
||||
errLabel:
|
||||
return rc;
|
||||
}
|
||||
|
||||
cw::rc_t cw::score_follower::exec( handle_t h, unsigned smpIdx, unsigned muid, unsigned status, uint8_t d0, uint8_t d1, bool& newMatchFlRef )
|
||||
cw::rc_t cw::score_follower::exec( handle_t h, double sec, unsigned smpIdx, unsigned muid, unsigned status, uint8_t d0, uint8_t d1, bool& newMatchFlRef )
|
||||
{
|
||||
rc_t rc = kOkRC;
|
||||
score_follower_t* p = _handleToPtr(h);
|
||||
@ -328,7 +363,8 @@ cw::rc_t cw::score_follower::exec( handle_t h, unsigned smpIdx, unsigned muid,
|
||||
|
||||
newMatchFlRef = false;
|
||||
|
||||
cmRC_t cmRC = cmScMatcherExec( p->matcher, smpIdx, muid, status, d0, d1, &scLocIdx );
|
||||
// Note: pass p->perf_idx as 'muid' to the score follower
|
||||
cmRC_t cmRC = cmScMatcherExec( p->matcher, smpIdx, p->perf_idx, status, d0, d1, &scLocIdx );
|
||||
|
||||
switch( cmRC )
|
||||
{
|
||||
@ -353,6 +389,20 @@ cw::rc_t cw::score_follower::exec( handle_t h, unsigned smpIdx, unsigned muid,
|
||||
rc = cwLogError(kOpFailRC,"The score follower failed with an unknown error. cmRC:%i",cmRC);
|
||||
}
|
||||
|
||||
// store note-on messages
|
||||
if( p->perf_idx < p->perfN && midi::isNoteOn(status,(unsigned)d1) )
|
||||
{
|
||||
|
||||
ssf_note_on_t* pno = p->perfA + p->perf_idx;
|
||||
pno->sec = sec;
|
||||
pno->pitch = d0;
|
||||
pno->vel = d1;
|
||||
p->perf_idx += 1;
|
||||
if( p->perf_idx >= p->perfN )
|
||||
cwLogWarning("The cw score follower performance cache is full.");
|
||||
}
|
||||
|
||||
|
||||
return rc;
|
||||
|
||||
}
|
||||
@ -371,6 +421,46 @@ void cw::score_follower::clear_match_id_array( handle_t h )
|
||||
p->match_id_curN = 0;
|
||||
}
|
||||
|
||||
cw::rc_t cw::score_follower::write_svg_file( handle_t h, const char* out_fname )
|
||||
{
|
||||
score_follower_t* p = _handleToPtr(h);
|
||||
|
||||
return svgScoreFollowWrite( p->cmScoreH, p->matcher, p->perfA, p->perf_idx, out_fname );
|
||||
}
|
||||
|
||||
void cw::score_follower::score_report( handle_t h, const char* out_fname )
|
||||
{
|
||||
score_follower_t* p = _handleToPtr(h);
|
||||
cmScoreReport( p->cmCtx, p->score_csv_fname, out_fname );
|
||||
}
|
||||
|
||||
cw::rc_t cw::score_follower::midi_state_rt_report( handle_t h, const char* out_fname )
|
||||
{
|
||||
score_follower_t* p = _handleToPtr(h);
|
||||
midi_state::config_t msCfg = midi_state::default_config();
|
||||
rc_t rc = kOkRC;
|
||||
midi_state::handle_t msH;
|
||||
|
||||
if((rc = midi_state::create(msH,nullptr,nullptr,&msCfg)) != kOkRC )
|
||||
{
|
||||
rc = cwLogError(rc,"midi_state create failed.");
|
||||
goto errLabel;
|
||||
}
|
||||
|
||||
if((rc = _update_midi_state(p,msH)) != kOkRC )
|
||||
goto errLabel;
|
||||
|
||||
if((rc = report_events(msH,out_fname)) != kOkRC )
|
||||
goto errLabel;
|
||||
|
||||
errLabel:
|
||||
if( rc != kOkRC )
|
||||
cwLogError(rc,"Score follower midi_state_rt_report() failed.");
|
||||
|
||||
midi_state::destroy(msH);
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
namespace cw {
|
||||
namespace score_follower {
|
||||
@ -497,9 +587,11 @@ cw::rc_t cw::score_follower::test( const object_t* cfg )
|
||||
|
||||
if( midi::file::isNoteOn( m ) )
|
||||
{
|
||||
unsigned long smpIdx = (unsigned long)(t.srate * m->amicro/1e6);
|
||||
bool newMatchFl = false;
|
||||
if((rc = exec(sfH, smpIdx, m->uid, m->status, m->u.chMsgPtr->d0, m->u.chMsgPtr->d1, newMatchFl )) != kOkRC )
|
||||
double sec = (double)m->amicro/1e6;
|
||||
unsigned long smpIdx = (unsigned long)(t.srate * m->amicro/1e6);
|
||||
bool newMatchFl = false;
|
||||
|
||||
if((rc = exec(sfH, sec, smpIdx, m->uid, m->status, m->u.chMsgPtr->d0, m->u.chMsgPtr->d1, newMatchFl )) != kOkRC )
|
||||
{
|
||||
rc = cwLogError(rc,"score follower exec failed.");
|
||||
goto errLabel;
|
||||
|
@ -5,6 +5,7 @@ namespace cw
|
||||
{
|
||||
namespace score_follower
|
||||
{
|
||||
|
||||
typedef handle< struct score_follower_str > handle_t;
|
||||
|
||||
rc_t create( handle_t& hRef, const object_t* cfg, cm::handle_t cmCtxH, double srate );
|
||||
@ -14,7 +15,7 @@ namespace cw
|
||||
rc_t reset( handle_t h, unsigned loc );
|
||||
|
||||
// If 'new_match_fl_ref' is returned as true then there are new match id's in the current_match_id_array[]
|
||||
rc_t exec( handle_t h, unsigned smpIdx, unsigned muid, unsigned status, uint8_t d0, uint8_t d1, bool& new_match_fl_ref );
|
||||
rc_t exec( handle_t h, double sec, unsigned smpIdx, unsigned muid, unsigned status, uint8_t d0, uint8_t d1, bool& new_match_fl_ref );
|
||||
|
||||
// Get a pointer to the event id's associated with the latest set of matches.
|
||||
const unsigned* current_match_id_array( handle_t h, unsigned& cur_match_id_array_cnt_ref );
|
||||
@ -22,6 +23,16 @@ namespace cw
|
||||
// Clear the match id array. This should be done to empty the current_match_id_array()
|
||||
void clear_match_id_array( handle_t h );
|
||||
|
||||
// Write an SVG file containing a graphic view of the score following results since the last call to reset().
|
||||
rc_t write_svg_file( handle_t h, const char* out_fname );
|
||||
|
||||
// Write the score to 'out_fname'.
|
||||
void score_report( handle_t h, const char* out_fname );
|
||||
|
||||
// Use the stored MIDI data received since the last call to reset to generate a report
|
||||
// using midi_state::report_events().
|
||||
rc_t midi_state_rt_report( handle_t h, const char* out_fname );
|
||||
|
||||
rc_t test( const object_t* cfg );
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user