From d2a3087a15139b00113b3f8ffbae8c17f8949696 Mon Sep 17 00:00:00 2001
From: kevin <kevin@zonk.verizon.net>
Date: Tue, 6 Oct 2020 10:16:11 -0400
Subject: [PATCH] main.cpp,main.cfg : Test setup updates.

---
 src/cwtest/cfg/main.cfg | 43 +++++++++++++++++++++--------------------
 src/cwtest/main.cpp     |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/cwtest/cfg/main.cfg b/src/cwtest/cfg/main.cfg
index 343bc99..f517ddc 100644
--- a/src/cwtest/cfg/main.cfg
+++ b/src/cwtest/cfg/main.cfg
@@ -192,24 +192,24 @@
     select_to_file:
     {
       outDir: "~/temp/kc_record/xform_only/cut",
-      outBits: 24,
+      outBits: 32,
       selectL: [
-        { begSec: 1743.3, endSec:  1816.44, dst: "dry_mix.wav", src: "~/temp/kc_record/xform_only/dry/a_dry.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "a_mix.wav",   src: "~/temp/kc_record/xform_only/mix/a_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "b_mix.wav",   src: "~/temp/kc_record/xform_only/mix/b_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "c_mix.wav",   src: "~/temp/kc_record/xform_only/mix/c_mix.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "dry.wav", src: "~/temp/kc_record/xform_only/dry/a.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "a.wav",   src: "~/temp/kc_record/xform_only/wet/a.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "b.wav",   src: "~/temp/kc_record/xform_only/wet/b.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "c.wav",   src: "~/temp/kc_record/xform_only/wet/c.aiff" },
 	
-        { begSec: 1743.3, endSec:  1816.44, dst: "d_mix.wav",   src: "~/temp/kc_record/xform_only/mix/d_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "f1_mix.wav",  src: "~/temp/kc_record/xform_only/mix/f1_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "f2_mix.wav",  src: "~/temp/kc_record/xform_only/mix/f2_mix.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "d.wav",   src: "~/temp/kc_record/xform_only/wet/d.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "f1.wav",  src: "~/temp/kc_record/xform_only/wet/f1.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "f2.wav",  src: "~/temp/kc_record/xform_only/wet/f2.aiff" },
 
-        { begSec: 1743.3, endSec:  1816.44, dst: "f3_mix.wav",  src: "~/temp/kc_record/xform_only/mix/f3_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "f4_mix.wav",  src: "~/temp/kc_record/xform_only/mix/f4_mix.aiff" },
-        { begSec: 1743.3, endSec:  1816.44, dst: "g_mix.wav",   src: "~/temp/kc_record/xform_only/mix/g_mix.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "f3.wav",  src: "~/temp/kc_record/xform_only/wet/f3.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "f4.wav",  src: "~/temp/kc_record/xform_only/wet/f4.aiff" },
+        { begSec: 1743.3, endSec:  1816.44, dst: "g.wav",   src: "~/temp/kc_record/xform_only/wet/g.aiff" },
 	
-        { begSec: 1743.3, endSec: 1816.44, dst: "ga_mix.wav",  src: "~/temp/kc_record/xform_only/mix/ga_mix.aiff" },
-        { begSec: 1743.3, endSec: 1816.44, dst: "g1a_mix.wav", src: "~/temp/kc_record/xform_only/mix/g1a_mix.aiff" },
-        { begSec: 1743.3, endSec: 1816.44, dst: "g1d_mix.wav", src: "~/temp/kc_record/xform_only/mix/g1d_mix.aiff" },
+        { begSec: 1743.3, endSec: 1816.44, dst: "ga.wav",  src: "~/temp/kc_record/xform_only/wet/ga.aiff" },
+        { begSec: 1743.3, endSec: 1816.44, dst: "g1a.wav", src: "~/temp/kc_record/xform_only/wet/g1a.aiff" },
+        { begSec: 1743.3, endSec: 1816.44, dst: "g1d.wav", src: "~/temp/kc_record/xform_only/wet/g1d.aiff" },
 
 	]
       
@@ -258,23 +258,24 @@
 
     transform_app:
     {
-    	srcDir: "~/temp/kc_record/xform_only/wet",            // location of 'wet' source files
-	dryFn: "~/temp/kc_record/xform_only/dry/recd0.aiff",  // dry source file
+    	srcDir: "~/temp/kc_record/xform_only/cut",            // location of 'wet' source files
+	dryFn: "~/temp/kc_record/xform_only/cut/dry.wav",  // dry source file
 	
 	dstPreFn:  "~/temp/test_xform_app.wav",     // the output file prior to reverb
 	dstRevFn:  "~/temp/test_xform_app_rev.wav", // the output file with reverb
 	
 	dstBits: 32,
 
+	irEnableFl: true,
 	irScale: 0.25,
-	irFn: "~/media/audio/IR/freeverb3/IR_theater.wav"
+	irFn: "~/media/audio/IR/freeverb3/101-cup.wav"
 
 	
 	argL: [
-	{ srcBegSec: 0.0,   srcEndSec:  4.2,  srcFn: "recd0.aiff",  fadeOutSec:0.5, wetGain:0.3  },
-	{ srcBegSec: 4.2,   srcEndSec:  8.6,  srcFn: "recd1.aiff",  fadeOutSec:0.5, wetGain:0.3  },
-	{ srcBegSec: 8.6,   srcEndSec: 15.67, srcFn: "recd2.aiff",  fadeOutSec:0.5, wetGain:0.3  },
-	{ srcBegSec: 15.67, srcEndSec: 17.98, srcFn: "recd3.aiff",  fadeOutSec:0.0, wetGain:0.3  },
+	{ srcBegSec: 0.0,   srcEndSec:  4.2,  srcFn: "a.wav",  fadeOutSec:0.5, wetGain:0.3  },
+	{ srcBegSec: 4.2,   srcEndSec:  8.6,  srcFn: "b.wav",  fadeOutSec:0.5, wetGain:0.3  },
+	{ srcBegSec: 8.6,   srcEndSec: 15.67, srcFn: "c.wav",  fadeOutSec:0.5, wetGain:0.3  },
+	{ srcBegSec: 15.67, srcEndSec: 17.98, srcFn: "d.wav",  fadeOutSec:0.0, wetGain:0.3  },
 	
 	]
     },
diff --git a/src/cwtest/main.cpp b/src/cwtest/main.cpp
index e3c38f7..bda1f6f 100644
--- a/src/cwtest/main.cpp
+++ b/src/cwtest/main.cpp
@@ -51,7 +51,7 @@
 #include "cwIoTest.h"
 #endif
 
-#if defined(cwWeb)
+#if !defined(cwWeb)
 #include "cwDataSets.h"
 #include "cwSvg.h"
 #endif