From d5e0db67777a7b4ec53d3cb5fdbeb1dec1787284 Mon Sep 17 00:00:00 2001 From: kevin Date: Sat, 1 Oct 2022 19:10:16 -0400 Subject: [PATCH] cfg/main.cfg : many updates --- src/cwtest/cfg/main.cfg | 154 +++++++++++++++++++++++++++++++++++----- 1 file changed, 136 insertions(+), 18 deletions(-) diff --git a/src/cwtest/cfg/main.cfg b/src/cwtest/cfg/main.cfg index 1e236b5..3315f07 100644 --- a/src/cwtest/cfg/main.cfg +++ b/src/cwtest/cfg/main.cfg @@ -321,10 +321,76 @@ midifile: { - rpt0: { midiFn:"~/media/audio/midi/988-v25.mid" } - rpt: { midiFn:"~/src/currawong/audio/workshop/taka1/record_3/midi.mid"} - csv0: { midiFn:"~/src/currawong/site/web_part_selection/GUTIM part 1 no colors, single system all sections correcting staves distance.mid", - csvFn: "~/temp/midi.csv" } + //rpt0: { midiFn:"~/media/audio/midi/988-v25.mid" } + //rpt: { midiFn:"~/src/currawong/audio/workshop/demare2/record_5/midi.mid"} + // csv: { midiFn:"~/src/currawong/audio/workshop/demare2/record_5/midi.mid", csvFn: "midi.csv" } + //csv0: { midiFn:"~/src/currawong/site/web_part_selection/GUTIM part 1 no colors, single system all sections correcting staves distance.mid", + // csvFn: "~/temp/midi.csv" } + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "beck1", + take_begin: 0, + take_end: 9, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "beck2", + take_begin: 0, + take_end: 9, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "taka1", + take_begin: 0, + take_end: 10, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "taka2", + take_begin: 0, + take_end: 16, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "nonken1", + take_begin: 0, + take_end: 18, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "nonken2", + take_begin: 0, + take_end: 12, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "demare1", + take_begin: 0, + take_end: 13, + print_warnings_flag: false + }, + + batch_convert: { + io_dir: "~/src/currawong/audio/workshop", + session_dir: "demare2", + take_begin: 0, + take_end: 10, + print_warnings_flag: false + }, + }, audiofile: @@ -770,7 +836,7 @@ audio_transforms: {}, - am_to_midi_file: { inDir: "~/src/currawong/audio/workshop/taka1" }, + am_to_midi_file: { inDir: "~/src/currawong/audio/workshop/nonken2" }, audio_file_proc: { srcFn: "/home/kevin/src/currawong/audio/GUTIM_All_20200711_96k_float.wav", @@ -1300,11 +1366,16 @@ params: { //score_fn: "~/src/currawong/projects/score_proc/data/play_file.csv", - score_fn: "~/src/cwtest/src/cwtest/cfg/preset_sel/score/20220423/temp.csv", + //score_fn: "~/src/cwtest/src/cwtest/cfg/preset_sel/score/20220423/temp.csv", + //score_fn: "~/src/currawong/projects/score_follow/play_score.csv", + score_fn: "~/src/currawong/audio/workshop/beck1/record_4/play_score.csv" record_dir: "~/src/cwtest/src/cwtest/cfg/preset_sel/preset_sel_fragments", + //record_fn: "preset_sel_20220423", - record_fn: "preset_sel_20220507", + //record_fn: "preset_sel_20220507", + record_fn: "temp_frag" + record_fn_ext: "txt", @@ -1344,6 +1415,9 @@ midi_out_device: "Scarlett 18i20 USB", midi_out_port: "Scarlett 18i20 USB MIDI 1", + //midi_out_device: "Fastlane", + //midi_out_port: "Fastlane MIDI A", + //midi_out_device: "PipeWire-RT-Event", //midi_out_port: "input", @@ -1360,22 +1434,25 @@ // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 // spirio vel_table: [ 1, 4, 10, 12, 12, 18, 24, 24, 30, 36, 36, 44, 48, 52, 58, 64, 64, 70, 76, 82, 88, 94,100,106,112 ] - vel_table: [ 1, 5 10, 16, 21, 26, 32, 37, 42, 48, 53, 58, 64, 69, 74, 80, 85, 90, 96,101,106,112,117,122,127 ] , + + // vel_table: [ 1, 5 10, 16, 21, 26, 32, 37, 42, 48, 53, 58, 64, 69, 74, 80, 85, 90, 96,101,106,112,117,122,127 ] , }, { enableFl: true, - midi_out_device: "Fastlane", - midi_out_port: "Fastlane MIDI A", - //midi_out_device: "MIDIFACE 2x2", - //midi_out_port: "MIDIFACE 2x2 Midi Out 2", + //midi_out_device: "Fastlane", + //midi_out_port: "Fastlane MIDI A", + midi_out_device: "MIDIFACE 2x2", + midi_out_port: "MIDIFACE 2x2 Midi Out 2", //midi_out_device: "PC-300", //midi_out_port: "PC-300 MIDI 1", // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 34 - vel_table: [ 1, 5 10, 16, 21, 26, 32, 37, 42, 48, 53, 58, 64, 69, 74, 80, 85, 90, 96,101,106,112,117,122,127 ] , + // vel_table: [ 1, 5 10, 16, 21, 26, 32, 37, 42, 48, 53, 58, 64, 69, 74, 80, 85, 90, 96,101,106,112,117,122,127 ] , + + // 20221001 vel_table: [ 1, 4, 10, 12, 12, 18, 24, 24, 30, 36, 36, 44, 48, 52, 58, 64, 64, 70, 76, 82, 88, 94,100,106,112 ] }, //{ midi_out_device: "PipeWire-RT-Event", midi_out_port: "input" }, @@ -1513,8 +1590,8 @@ printClassDictFl: false, // print the class description dictionary - - network: { + // Simulate SPIRIO with Synchron + non_spirio_network: { aud_in: { class: audio_in, args:{ default:{dev_label:"main"} } }, // select the first two channels (this reduces the channel count if there are more than 2 incoming channels) @@ -1555,8 +1632,9 @@ aout: { class: audio_out, in:{ in:merge1.out }, args:{ default:{dev_label:"main"} } }, } - - spirio_network: { + + // SPIRIO network + network: { aud_in: { class: audio_in, args:{ default:{dev_label:"main"} } }, // select the first two channels (this reduces the channel count if there are more than 2 incoming channels) @@ -1590,7 +1668,47 @@ // merge the wet/dry signals into a single 4 channel signal merge: { class: audio_merge, in:{ in0:mstr_wet_out_gain.out, in1:mstr_dry_out_gain.out }, args:{} }, - aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } }, + //aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } }, + aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } }, + } + + // stereo network + stereo_network: { + aud_in: { class: audio_in, args:{ default:{dev_label:"main"} } }, + + // select the first two channels (this reduces the channel count if there are more than 2 incoming channels) + split_in: { class: audio_split, in:{ in:aud_in.out } args:{ default:{select[1,1]}} } + + // delay the incoming audio signal to sync it with the piano + sync_delay { class: audio_delay, in: { in:split_in.out }, args:{ default:{ delayMs:400 } }} + + mstr_wet_in_gain: { class: audio_gain, in:{ in:sync_delay.out }, args:{}} + + // wet signal processing chain + wet_in_gain: { class: audio_gain, in:{ in:mstr_wet_in_gain.out }, args:{}}, + pva: { class: pv_analysis, in:{ in:wet_in_gain.out }, args:{ default:{ wndSmpN:512, hopSmpN:128, hzFl:false } } }, + sd: { class: spec_dist, in:{ in:pva.out }, preset:kc }, + pvs: { class: pv_synthesis, in:{ in:sd.out }, }, + cmp: { class: compressor, in:{ in:pvs.out }, preset:kc }, + + wet_out_gain: { class: audio_gain, in:{ in:cmp.out }, args:{}}, + + mute_wet: { class: audio_gain, in:{ in:wet_out_gain.out }, args:{}}, + + + // apply the wet/dry gain balance + wd_bal: { class: balance, args{}}, + wet_bal_gain: { class: audio_gain, in:{ in:mute_wet.out, gain:wd_bal.out }, args:{}}, + dry_bal_gain: { class: audio_gain, in:{ in:sync_delay.out, gain:wd_bal.inv_out }, args:{}}, + + mstr_wet_out_gain: { class: audio_gain, in:{ in:wet_bal_gain.out }, args:{}} + //mstr_dry_out_gain: { class: audio_gain, in:{ in:dry_bal_gain.out }, args:{}}, + + // merge the wet/dry signals into a single 4 channel signal + //merge: { class: audio_merge, in:{ in0:mstr_wet_out_gain.out, in1:mstr_dry_out_gain.out }, args:{} }, + + //aout: { class: audio_out, in:{ in:merge.out }, args:{ default:{dev_label:"main"} } }, + aout: { class: audio_out, in:{ in:mstr_wet_out_gain.out }, args:{ default:{dev_label:"main"} } }, } presets: {