From 45b7616c0070cd89fddbacc9f6aeab1092e043fd Mon Sep 17 00:00:00 2001
From: kevin <kevin@larke.org>
Date: Sun, 14 Jul 2024 15:30:29 -0400
Subject: [PATCH] main.cpp,main.cfg,cfg/io.cfg : Latest configurations.

---
 src/caw/cfg/io.cfg |  4 ++--
 src/caw/main.cfg   | 32 ++++++++++++++++++++++++++------
 src/caw/main.cpp   | 10 ++++------
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/caw/cfg/io.cfg b/src/caw/cfg/io.cfg
index 7243247..d156527 100644
--- a/src/caw/cfg/io.cfg
+++ b/src/caw/cfg/io.cfg
@@ -82,8 +82,8 @@
                   {
 		    // System device name
 
-		    //device:       "Scarlett 18i20 USB USB Audio",
-		    device:       "USB Audio CODEC USB Audio",
+		    device:       "Scarlett 18i20 USB USB Audio",
+		    //device:       "USB Audio CODEC USB Audio",
 		    //device:       "HDA Intel PCH CS4208 Analog",
 		    
                     activeFl:       true,   // (req)
diff --git a/src/caw/main.cfg b/src/caw/main.cfg
index b5a8200..b6afb4f 100644
--- a/src/caw/main.cfg
+++ b/src/caw/main.cfg
@@ -373,8 +373,11 @@
 	    }
 	  }
 
-	  amix:       { class: audio_mix, in:{ in_:voice_poly.voc_.out } },
-	  aout:       { class: audio_out, in:{ in:amix.out }, args:{ dev_label:"main"}}
+          asil: { class: audio_silence, args:{ ch_cnt:6 }}, 
+	  amix: { class: audio_mix, in:{ in_:voice_poly.voc_.out } },
+	  amrg: { class: audio_merge,    in:{ in0:asil.out, in1:amix.out } },
+
+	  aout: { class: audio_out, in:{ in:amrg.out }, args:{ dev_label:"main"}}
 	}
       }
     }
@@ -402,7 +405,7 @@
     
     piano_voice_20: {
       non_real_time_fl:false,
-      durLimitSecs:10,
+      durLimitSecs:30,
       
       network: {
         procs: {
@@ -418,16 +421,33 @@
 	      procs: {
 	        voc: { class:piano_voice, in:{ _.in:_.vctl.out_ },
 		                          out:{ _.done_fl:_.vctl.done_fl_ },
-					  args:{ wtb_dir:"~/temp/wt/bank", wtb_instr:"piano", test_pitch:60 } },
+					  args:{ wtb_dir:"~/temp/wt1/bank", wtb_instr:"piano", test_pitch:60 } },
 	      }
 	    }
 	  }
 
-	  amix:       { class: audio_mix, in:{ in_:voice_poly.voc_.out } },
-	  aout:       { class: audio_out, in:{ in:amix.out }, args:{ dev_label:"main"}}
+          asil: { class: audio_silence, args:{ ch_cnt:6 }}, 
+	  amix: { class: audio_mix,   in:{ in_:voice_poly.voc_.out } },
+	  asel: { class: audio_split, in:{ in:amix.out }, args:{ select:[0,1] }},
+	  amrg: { class: audio_merge, in:{ in0:asil.out, in1:asel.out0, in2:asel.out0 } },
+	  aout: { class: audio_out,   in:{ in:amrg.out }, args:{ dev_label:"main"}}
 	}
       }
     }
 
+    audio_test_21: {
+      non_real_time_fl:false,
+      durLimitSecs:5,
+      network: {
+        procs:  {
+	  asil: { class:audio_silence, args:{ ch_cnt:6 }}
+	  osc: { class:sine_tone, args:{ hz:440.0, chCnt:2 }},
+	  amrg: { class:audio_merge, in:{ in0:asil.out, in1:osc.out }, args:{ out_gain:1 } },
+	  amtr: { class:audio_meter, in:{ in:amrg.out }, args:{ rpt_ms:500 }},
+	  aout:{ class:audio_out, in:{ in:amrg.out }, args:{ dev_label:"main"} }
+
+	}
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/src/caw/main.cpp b/src/caw/main.cpp
index a76314a..cc2cec4 100644
--- a/src/caw/main.cpp
+++ b/src/caw/main.cpp
@@ -371,16 +371,14 @@ errLabel:
 }
 
 
-#include "cwMidi.h"
-#include "cwMidiFile.h"
-#include "cwDspTypes.h"
-#include "cwWaveTableBank.h"
+//#include "cwMidi.h"
+//#include "cwMidiFile.h"
+//#include "cwDspTypes.h"
+//#include "cwWaveTableBank.h"
 
 void _test_stub( app_t& app )
 {
 
-  wt_bank::test("/home/kevin/temp/wt/bank");
-  
 }
 
 int main( int argc, char* argv[] )