main.cpp,main.cfg : Added vectOpTest(),scoreFollowTest(),
This commit is contained in:
parent
48620bd597
commit
edffaf20f3
@ -19,6 +19,7 @@
|
||||
fileSys: {},
|
||||
numbCvt: {},
|
||||
object: {},
|
||||
vop:{},
|
||||
time:{},
|
||||
thread: {},
|
||||
kbTest1: {},
|
||||
@ -208,8 +209,12 @@
|
||||
record_fn_ext: "am",
|
||||
max_midi_msg_count: 32768,
|
||||
midi_timer_period_micro_sec: 15000,
|
||||
midi_out_device: "Fastlane",
|
||||
midi_out_port: "Fastlane MIDI A",
|
||||
//midi_out_device: "Fastlane",
|
||||
//midi_out_port: "Fastlane MIDI A",
|
||||
|
||||
midi_out_device: "iRig MIDI 2",
|
||||
midi_out_port: "iRig MIDI 2 MIDI 1",
|
||||
|
||||
audio_in_ch_map: [0, 1 ],
|
||||
audio_out_ch_map: [0, 1 ]
|
||||
},
|
||||
@ -223,6 +228,8 @@
|
||||
fmtBufByteN: 4096,
|
||||
websockTimeOutMs: 50, // max time out while blocking for a websock event
|
||||
uiCfgFn: "ui.cfg" // default UI resource description
|
||||
idleMsgPeriodMs: 50, // period without messages before an idle message is generated
|
||||
asyncFl: false
|
||||
},
|
||||
|
||||
|
||||
@ -232,6 +239,8 @@
|
||||
recvBufByteN: 512
|
||||
array: [
|
||||
{
|
||||
enableFl: false,
|
||||
asyncFl: false,
|
||||
label: "port1", // User label
|
||||
device: "/dev/ttyACM0", // Serial device name
|
||||
baud: 38400,
|
||||
@ -245,6 +254,7 @@
|
||||
|
||||
midi: {
|
||||
parserBufByteN: 1024,
|
||||
asyncFl: false
|
||||
},
|
||||
|
||||
audio: {
|
||||
@ -254,6 +264,7 @@
|
||||
groupL: [
|
||||
{
|
||||
enableFl: true, // (req)
|
||||
asyncFl: true,
|
||||
label: "main", // (req) User label
|
||||
id: 0, // (req) User id (can also be set at runtime)
|
||||
srate: 48000, // (req) Sample rate used by all devices in this group
|
||||
@ -281,6 +292,7 @@
|
||||
|
||||
socket: {
|
||||
|
||||
asyncFl: false,
|
||||
maxSocketCnt: 10,
|
||||
recvBufByteCnt: 4096,
|
||||
threadTimeOutMs: 50,
|
||||
@ -1733,7 +1745,7 @@
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
stereo_network: {
|
||||
ain: { class: audio_in, args:{ default:{dev_label:"main"} } },
|
||||
@ -1765,7 +1777,7 @@
|
||||
merge: { class: audio_merge, in:{ in0:wet_gain.out, in1:dry_gain.out }, args:{} },
|
||||
|
||||
aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } },
|
||||
}
|
||||
},
|
||||
|
||||
sine_network: {
|
||||
framesPerCycle: 64, // time-domain audio cycles frame per cycle
|
||||
@ -1786,13 +1798,26 @@
|
||||
|
||||
merge: { class: audio_merge, in:{ in0:mix.out, in1:splitR.out }, args:{}},
|
||||
aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } },
|
||||
}
|
||||
},
|
||||
|
||||
presets: {
|
||||
a: { splitL:hi, splitR:lo },
|
||||
b: { splitL:lo, splitR:hi }
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
score_follow: {
|
||||
"midi_fname": "~/src/currawong/audio/workshop/beck1/record_4/midi.mid",
|
||||
"srate": 48000,
|
||||
"out_dir": "~/temp/score_follow_test"
|
||||
|
||||
cfg: {
|
||||
"score_csv_fname": "~/src/currawong/projects/score_follow/cm_score.csv",
|
||||
"search_area_locN": 10,
|
||||
"key_wnd_locN": 7,
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -30,6 +30,8 @@
|
||||
#include "cwFlow.h"
|
||||
#include "cwPianoScore.h"
|
||||
#include "cwIoPresetSelApp.h"
|
||||
#include "cwCmInterface.h"
|
||||
#include "cwScoreFollower.h"
|
||||
|
||||
#if defined(cwWEBSOCK)
|
||||
#include "cwWebSock.h"
|
||||
@ -350,6 +352,16 @@ cw::rc_t objectTest( const cw::object_t* cfg, const cw::object_t* args, int argc
|
||||
return cw::kOkRC;
|
||||
}
|
||||
|
||||
cw::rc_t vectOpTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] )
|
||||
{
|
||||
int v1[] = { 1,2,1,2,1,2,1,2,1,2 };
|
||||
int v0[ 10 ];
|
||||
|
||||
cw::vop::deinterleave( v0, v1, 5, 2 );
|
||||
cw::vop::print(v0,10,"%i ");
|
||||
return cw::kOkRC;
|
||||
}
|
||||
|
||||
cw::rc_t timeTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::time::test(); }
|
||||
cw::rc_t threadTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::threadTest(); }
|
||||
cw::rc_t kbTest1Test( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { cw::kbTest1(); return cw::kOkRC; }
|
||||
@ -394,6 +406,8 @@ cw::rc_t flowTest( const cw::object_t* cfg, const cw::object_t* args
|
||||
return cw::flow::test(flow_proc_dict,args);
|
||||
}
|
||||
|
||||
cw::rc_t scoreFollowTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::score_follower::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); }
|
||||
@ -718,6 +732,7 @@ int main( int argc, const char* argv[] )
|
||||
{ "fileSys", fileSysTest },
|
||||
{ "numbCvt", numbCvtTest },
|
||||
{ "object", objectTest },
|
||||
{ "vop", vectOpTest },
|
||||
{ "time", timeTest },
|
||||
{ "thread", threadTest },
|
||||
{ "kbTest1", kbTest1Test },
|
||||
@ -777,6 +792,7 @@ int main( int argc, const char* argv[] )
|
||||
{ "flow_pv", flowTest },
|
||||
{ "flow_spec_dist", flowTest },
|
||||
{ "preset_sel", ioPresetSelTest },
|
||||
{ "score_follow", scoreFollowTest },
|
||||
{ "stub", stubTest },
|
||||
{ nullptr, nullptr }
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user