From d9ec512201e6292d4c0e0d4f3cab50e59ffcf87d Mon Sep 17 00:00:00 2001 From: kevin Date: Mon, 23 Dec 2024 16:38:46 -0500 Subject: [PATCH] perf_caw.cfg,preset_caw.cfg : Updates --- src/caw/perf/perf_caw.cfg | 66 +++++++++++++++++++++++++++-------- src/caw/preset/preset_caw.cfg | 6 ++-- 2 files changed, 55 insertions(+), 17 deletions(-) diff --git a/src/caw/perf/perf_caw.cfg b/src/caw/perf/perf_caw.cfg index e97b7fc..7602644 100644 --- a/src/caw/perf/perf_caw.cfg +++ b/src/caw/perf/perf_caw.cfg @@ -25,9 +25,11 @@ network: { procs: { - player: { class:score_player, args:{ fname:"$/score_20240504.csv", vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, + player: { class:score_player, args:{ fname:"$/score_20240504.csv" }}, + samp_vt:{ class: vel_table, in:{ in:player.out }, args:{ vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, + stop: { class: halt, in:{ in:player.done_fl }} - vctl: { class: poly_voice_ctl, in:{ in:player.out }, args:{ voice_cnt:20 } }, + vctl: { class: poly_voice_ctl, in:{ in:smp_vt.out }, args:{ voice_cnt:20 } }, voice_poly: { class: poly, @@ -56,9 +58,11 @@ network: { procs: { - player: { class:score_player, args:{ fname:"$/score_20240504.csv", vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, + player: { class:score_player, args:{ fname:"$/score_20240504.csv" }}, + samp_vt:{ class: vel_table, in:{ in:player.out }, args:{ vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, + stop: { class: halt, in:{ in:player.done_fl }} - vctl: { class: poly_voice_ctl, in:{ in:player.out }, args:{ voice_cnt:20 } }, + vctl: { class: poly_voice_ctl, in:{ in:samp_vt.out }, args:{ voice_cnt:20 } }, voice_poly: { class: poly, @@ -90,14 +94,22 @@ network: { procs: { - player: { class:score_player, args:{ fname:"$/score_20240504.csv", vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, - stop: { class: halt, in:{ in:player.done_fl }} - vctl: { class: poly_voice_ctl, in:{ in:player.out }, args:{ voice_cnt:20 } }, - ps: { class: preset_select, preset:init, in:{ in:player.out }, args:{ fname:"$/m1_458_trans_6.txt", preset_proc:"xf_poly" } } + player: { class:score_player, args:{ fname:"$/score_20240504.csv" }}, + + pian_vt:{ class: vel_table, in:{ in:player.out }, args:{ vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"spirio" }}, + samp_vt:{ class: vel_table, in:{ in:player.out }, args:{ vel_tbl_fname:"$/vel_table_perf.json", vel_tbl_label:"ivory" }}, + + + stop: { class: halt, in:{ in:player.done_fl }} + + mout: { class: midi_out, in:{ rin:pian_vt.out }, args:{ print_fl:false, dev_label:"Fastlane", port_label:"Fastlane MIDI A" } } + vctl: { class: poly_voice_ctl, in:{ in:samp_vt.out }, args:{ voice_cnt:30 } }, + ps: { class: preset_select, preset:init, in:{ in:player.out }, args:{ fname:"$/m1_458_trans_6.txt", preset_proc:"xf_poly" } } voice_poly: { class: poly, - args: { count:20, parallel_fl:false } + in: { count:vctl.voice_cnt } + args: { parallel_fl:false } network: { procs: { @@ -105,7 +117,7 @@ // out:{ _.done_fl:_.vctl.done_fl_ }, // args:{ wtb_fname:"~/temp/wt6/wt_bank.json", wtb_instr:"piano" } }, - voc: { class:midi_voice, in:{ _.in:_.vctl.out_ }, out:{ _.done_fl:_.vctl.done_fl_ }, args:{chCnt:2, gain:0.2 } }, + voc: { class:midi_voice, in:{ _.in:_.vctl.out_ }, out:{ _.done_fl:_.vctl.done_fl_ }, args:{print_fl:false, chCnt:2, gain:0.2 } }, } } } @@ -113,12 +125,15 @@ xf_ctl: { class:poly_xform_ctl, in:{ in_:voice_poly.voc_.out, midi_:vctl.out_, donefl_:voice_poly.voc_.done_fl, - out_ch_idx:ps.out_idx }, args:{ out_ch_cnt:5 } } + out_ch_idx:ps.out_idx }, args:{ out_ch_cnt:10 } } xf_poly : { class: poly, - args: { count:5, parallel_fl:false } + in: { count:xf_ctl.out_ch_cnt, preset_sfx_id:ps.out_idx, preset_label:ps.preset_label }, + + args: { parallel_fl:false } + network: { procs: { pva: { class: pv_analysis, in:{ in:_.xf_ctl.out }, args:{ wndSmpN:512, hopSmpN:128, hzFl:false } }, @@ -146,9 +161,32 @@ } } - amix: { class: audio_mix, in:{ in_:xf_poly.ogain_.out } args:{ igain_:1.0 }}, + wet_poly_mix: { class: audio_mix, in:{ in_:xf_poly.ogain_.out } args:{ igain_:1.0 }}, + dry_poly_mix: { class: audio_mix, in:{ in_:voice_poly.voc_.out} args:{ igain_:1.0 }}, + //amix: { class: audio_mix, in:{ in_:xf_ctl.out_ } args:{ igain_:1.0 }}, - aout: { class: audio_out, in:{ in:amix.out }, args:{ dev_label:"main"}} + //aout: { class: audio_out, in:{ in:amix.out }, args:{ dev_label:"main"}} + + // apply the wet/dry gain balance + wd_bal: { class: balance, args{}}, + wet_bal_gain: { class: audio_gain, in:{ in:wet_poly_mix.out, gain:wd_bal.out } }, + dry_bal_gain: { class: audio_gain, in:{ in:dry_poly_mix.out, gain:wd_bal.inv_out } }, + + mstr_wet_out: { class: audio_gain, in:{ in:wet_bal_gain.out }, args:{ gain:0.5 } } + mstr_dry_out: { class: audio_gain, in:{ in:dry_bal_gain.out }, args:{ gain:0.5 } }, + + + // merge the wet/dry signals into a single 4 channel signal + merge: { class: audio_merge, in:{ in0:mstr_wet_out.out, in1:mstr_dry_out.out } }, + + // delay the incoming signal to sync it with the piano + sync_delay { class: audio_delay, in: { in:merge.out }, args:{ delayMs:400 }} + + //aout: { class: audio_out, in:{ in:sync_delay.out }, args:{ dev_label:"main" } }, + + sel_two: { class: audio_split, in:{ in:sync_delay.out } args:{ select[0,0,1,1]} } + aout: { class: audio_out, in:{ in:sel_two.out0 }, args:{ dev_label:"main" } }, + } } diff --git a/src/caw/preset/preset_caw.cfg b/src/caw/preset/preset_caw.cfg index 50c81cc..ea95a91 100644 --- a/src/caw/preset/preset_caw.cfg +++ b/src/caw/preset/preset_caw.cfg @@ -92,9 +92,9 @@ presets: { - aa:{ osc:{ gain:0.3 } }, - bb:{ osc:{ gain:0.4 } }, - cc:{ osc2:{ gain:0.1 }, osc0_2: { gain:0.2 } }, + aa:{ osc:{ gain:0.3 }, lfo:lfo1 }, + bb:{ osc:{ gain:0.4 }, lfo:lfo2 }, + cc:{ osc2:{ gain:0.1 }, osc0_2: { gain:0.2 }, lfo:lfo3 }, } } }