diff --git a/src/cwtest/cfg/main.cfg b/src/cwtest/cfg/main.cfg index d63d54a..268b841 100644 --- a/src/cwtest/cfg/main.cfg +++ b/src/cwtest/cfg/main.cfg @@ -46,6 +46,7 @@ socketSrvUdp: {}, socketSrvTcp: {}, sockMgrTest: {}, + uiTest: { ui: { physRootDir: "/home/kevin/src/cwtest/src/libcw/html/uiTest", @@ -317,7 +318,8 @@ }, audioDevFileTest: { - inAudioFname: "~/temp/temp_sine_100_hz.wav", + //inAudioFname: "~/temp/temp_sine_100_hz.wav", + inAudioFname: "~/temp/headphone_temp_0.wav", outAudioFname: "~/temp/test.wav", framesPerCycle:1024, @@ -1943,6 +1945,38 @@ titleL: [ "status","d0","d1" ] // titleL: [] }, + + sfscore: { + //cm_score_fname: "~/src/cwtest/src/cwtest/cfg/gutim_full/cm_score.csv", + cm_score_fname: "/home/kevin/src/currawong/projects/score_proc/score_out.csv" + srate: 48000, + + dyn_ref: { + "silent": 1, + "pppp":10, + "ppp_m":20, + "ppp":25, + "ppp_p":30, + "pp_m":30, + "pp":35, + "pp_p":40, + "p_m":40, + "p":45, + "p_p":50, + "mp_m":50 + "mp":55 + "mp_p":60, + "mf_m":60, + "mf":65, + "mf_p":70, + "f_m":70, + "f":75, + "f_p":80, + "ff":85, + "fff":100, + "ffff":120 + } + } diff --git a/src/cwtest/main.cpp b/src/cwtest/main.cpp index d6e13cf..949e540 100644 --- a/src/cwtest/main.cpp +++ b/src/cwtest/main.cpp @@ -46,6 +46,7 @@ #include "cwMidi.h" #include "cwMidiFile.h" #include "cwAudioDevice.h" +#include "cwSfScore.h" #if defined(cwALSA) #include "cwMidiPort.h" @@ -406,7 +407,7 @@ cw::rc_t scoreFollowTest( const cw::object_t* cfg, const cw::object_t* args, int cw::rc_t svgMidiFileTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::svg_midi::test_midi_file(args); } cw::rc_t midiStateTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::midi_state::test(args); } cw::rc_t csvTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::csv::test(args); } - +cw::rc_t sfScoreTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::sfscore::test(args); } #if defined(cwWEBSOCK) cw::rc_t websockSrvTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::websockSrvTest(cfg); } @@ -796,6 +797,7 @@ int main( int argc, const char* argv[] ) { "svg_midi_file", svgMidiFileTest }, { "midi_state", midiStateTest }, { "csv", csvTest }, + { "sfscore", sfScoreTest }, { "stub", stubTest }, { nullptr, nullptr } };