cml
/
libcm
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

cmDspPgmKr.c : Enabled kr1 in transform channel. Fixed cross fade problem in _cmDspSysPgm_TksbLite().

master
kevin 9 years ago
parent
5ee8f27b03
commit
0c9f02d130
1 changed files with 48 additions and 35 deletions
Split View Show Diff Stats
  1. 48
    35
      dsp/cmDspPgmKr.c

+ 48
- 35
dsp/cmDspPgmKr.c View File 

@@ -123,7 +123,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
123 123 
   cmDspInst_t* cost_sr  = cmDspSysAllocInst(h, "ScaleRange",  NULL,  4,  0.0,   1.0, 0.001, 1.0 );
124 124
125 125 
   // Measurement -> parameter mappers
126 
-  cmDspInst_t* even_rt  = cmDspSysAllocInst(h, "Router",      NULL,  2,  measRtrChCnt, measRtrChCnt-1 );
126 
+  cmDspInst_t* even_rt  = cmDspSysAllocInst(h, "Router",      lbl("even_rt"),  2,  measRtrChCnt, measRtrChCnt-1 );
127 127 
   cmDspInst_t* dynm_rt  = cmDspSysAllocInst(h, "Router",      NULL,  2,  measRtrChCnt, measRtrChCnt-1 );
128 128 
   cmDspInst_t* tmpo_rt  = cmDspSysAllocInst(h, "Router",      NULL,  2,  measRtrChCnt, measRtrChCnt-1 );
129 129 
   cmDspInst_t* cost_rt  = cmDspSysAllocInst(h, "Router",      NULL,  2,  measRtrChCnt, measRtrChCnt-1 );
 
@@ -138,7 +138,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
138 138
139 139 
   // Parameter-> kr routers (routers used to cross-fade between the two kr units)
140 140 
   unsigned paramRtChCnt = 2;
141 
-  cmDspInst_t* mod_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
141 
+  cmDspInst_t* mod_rt   = cmDspSysAllocInst(h, "Router",      lbl("mod_rt"),  2,  paramRtChCnt, paramRtChCnt-1 );
142 142 
   cmDspInst_t* wnd_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
143 143 
   cmDspInst_t* hop_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
144 144 
   cmDspInst_t* thr_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
 
@@ -150,15 +150,14 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
150 150
151 151 
   // Audio processors
152 152 
   cmDspInst_t* kr0  = cmDspSysAllocInst(h, "Kr",         NULL,   2, krWndSmpCnt, krHopFact );
153 
-  //cmDspInst_t* kr1  = cmDspSysAllocInst(h, "Kr",         NULL,   2, krWndSmpCnt, krHopFact );
153 
+  cmDspInst_t* kr1  = cmDspSysAllocInst(h, "Kr",         NULL,   2, krWndSmpCnt, krHopFact );
154 154 
   cmDspInst_t* xfad = cmDspSysAllocInst(h, "Xfader",     NULL,   3, xfadeChCnt,  xfadeMs, xfadeInitFl );
155 155 
   cmDspInst_t* mix  = cmDspSysAllocInst(h, "AMix",       NULL,   3, xfadeChCnt,  mixGain, mixGain );
156 156 
   cmDspInst_t* cmp  = cmDspSysAllocInst(h, "Compressor", NULL,   8, cmpBypassFl, cmpThreshDb, cmpRatio_num, cmpAtkMs, cmpRlsMs, cmpMakeup, cmpWndMs, cmpWndMaxMs );
157 157
158 
-
159 158 
   // Internal audio connections
160 159 
   cmDspSysConnectAudio(h, kr0,  "out",   xfad, "in-0");
161 
-  //cmDspSysConnectAudio(h, kr1,  "out",   xfad, "in-1");
160 
+  cmDspSysConnectAudio(h, kr1,  "out",   xfad, "in-1");
162 161 
   cmDspSysConnectAudio(h, xfad, "out-0", mix,  "in-0");
163 162 
   cmDspSysConnectAudio(h, xfad, "out-1", mix,  "in-1");
164 163 
   cmDspSysConnectAudio(h, mix,  "out",   cmp,  "in" );
 
@@ -232,22 +231,23 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
232 231 
   cmDspInst_t* lwr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Lwr slope"), 0.3,  10.0, 0.01,  2.0 );
233 232 
   cmDspInst_t* off_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Offset"),    0.0, 100.0, 0.01, 20.0 );
234 233 
   cmDspInst_t* inv_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Invert"),    0.0,   1.0, 1.0,   0.0 );
235 
-  cmDspInst_t* wet_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Wet Dry"),   0.0,   1.0, 0.001, 1.0 );
234 
+  cmDspInst_t* wet_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Wet Dry"),   0.0,   1.0, 0.001, 1.0 );
235 
+
236 236
237 237 
   cmDspSysInstallCb(h, mod_ctl, "val",         mod_rt, "f-in",    NULL );
238 238 
   cmDspSysInstallCb(h, achan,   "ch",          mod_rt, "sel",     NULL );   // ach->rt sel
239 239 
   cmDspSysInstallCb(h, mod_rt,  "f-out-0",     kr0,    "mode",    NULL );   // mode->kr
240 
-  //cmDspSysInstallCb(h, mod_rt,  "f-out-1",     kr1,    "mode",    NULL );   // mode->kr
240 
+  cmDspSysInstallCb(h, mod_rt,  "f-out-1",     kr1,    "mode",    NULL );   // mode->kr
241 241
242 242 
   cmDspSysInstallCb(h, wnd_ctl, "out",         wnd_rt, "f-in",    NULL );
243 243 
   cmDspSysInstallCb(h, achan,   "ch",          wnd_rt, "sel",     NULL );   // ach->rt sel
244 244 
   cmDspSysInstallCb(h, wnd_rt,  "f-out-0",     kr0,    "wndn",    NULL );   // wndn->kr
245 
-  //cmDspSysInstallCb(h, wnd_rt,  "f-out-1",     kr1,    "wndn",    NULL );   // wndn->kr
245 
+  cmDspSysInstallCb(h, wnd_rt,  "f-out-1",     kr1,    "wndn",    NULL );   // wndn->kr
246 246
247 247 
   cmDspSysInstallCb(h, hop_ctl, "out",         hop_rt, "f-in",    NULL );
248 248 
   cmDspSysInstallCb(h, achan,   "ch",          hop_rt, "sel",     NULL );   // ach->rt sel
249 249 
   cmDspSysInstallCb(h, hop_rt,  "f-out-0",     kr0,    "hopf",    NULL );   // hopf->kr
250 
-  //cmDspSysInstallCb(h, hop_rt,  "f-out-1",     kr1,    "hopf",    NULL );   // hopf->kr
250 
+  cmDspSysInstallCb(h, hop_rt,  "f-out-1",     kr1,    "hopf",    NULL );   // hopf->kr
251 251
252 252 
   cmDspSysInstallCb(h, min_thr_ctl, "val",     thr_sr, "min_out", NULL );
253 253 
   cmDspSysInstallCb(h, max_thr_ctl, "val",     thr_sr, "max_out", NULL );
 
@@ -259,7 +259,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
259 259 
   cmDspSysInstallCb(h, thr_ctl,     "val",     thr_rt, "f-in",    NULL );
260 260 
   cmDspSysInstallCb(h, achan,       "ch",      thr_rt, "sel",     NULL );   // ach->rt sel
261 261 
   cmDspSysInstallCb(h, thr_rt,      "f-out-0", kr0,    "thrh",    NULL );   // thr->kr
262 
-  //cmDspSysInstallCb(h, thr_rt,      "f-out-1", kr1,    "thrh",    NULL );   // thr->kr
262 
+  cmDspSysInstallCb(h, thr_rt,      "f-out-1", kr1,    "thrh",    NULL );   // thr->kr
263 263
264 264 
   cmDspSysInstallCb(h, min_upr_ctl, "val",     upr_sr, "min_out", NULL );
265 265 
   cmDspSysInstallCb(h, max_upr_ctl, "val",     upr_sr, "max_out", NULL );
 
@@ -271,7 +271,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
271 271 
   cmDspSysInstallCb(h, upr_ctl,     "val",     upr_rt, "f-in",    NULL );
272 272 
   cmDspSysInstallCb(h, achan,       "ch",      upr_rt, "sel",     NULL );   // ach->rt sel
273 273 
   cmDspSysInstallCb(h, upr_rt,      "f-out-0", kr0,    "uprs",    NULL );   // upr->kr
274 
-  //cmDspSysInstallCb(h, upr_rt,      "f-out-1", kr1,    "uprs",    NULL );   // upr->kr
274 
+  cmDspSysInstallCb(h, upr_rt,      "f-out-1", kr1,    "uprs",    NULL );   // upr->kr
275 275
276 276 
   cmDspSysInstallCb(h, min_lwr_ctl, "val",     lwr_sr, "min_out", NULL );
277 277 
   cmDspSysInstallCb(h, max_lwr_ctl, "val",     lwr_sr, "max_out", NULL );
 
@@ -283,7 +283,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
283 283 
   cmDspSysInstallCb(h, lwr_ctl,     "val",     lwr_rt, "f-in",    NULL );
284 284 
   cmDspSysInstallCb(h, achan,       "ch",      lwr_rt, "sel",     NULL );   // ach->rt sel
285 285 
   cmDspSysInstallCb(h, lwr_rt,      "f-out-0", kr0,    "lwrs",    NULL );   // lwr->kr
286 
-  //cmDspSysInstallCb(h, lwr_rt,      "f-out-1", kr1,    "lwrs",    NULL );   // lwr->kr
286 
+  cmDspSysInstallCb(h, lwr_rt,      "f-out-1", kr1,    "lwrs",    NULL );   // lwr->kr
287 287
288 288 
   cmDspSysInstallCb(h, min_off_ctl, "val",     off_sr, "min_out", NULL );
289 289 
   cmDspSysInstallCb(h, max_off_ctl, "val",     off_sr, "max_out", NULL );
 
@@ -295,12 +295,12 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
295 295 
   cmDspSysInstallCb(h, off_ctl,     "val",     off_rt, "f-in",    NULL );
296 296 
   cmDspSysInstallCb(h, achan,       "ch",      off_rt, "sel",     NULL );   // ach->rt sel
297 297 
   cmDspSysInstallCb(h, off_rt,      "f-out-0", kr0,    "offs",    NULL );   // off->kr
298 
-  //cmDspSysInstallCb(h, off_rt,      "f-out-1", kr1,    "offs",    NULL );   // off->kr
298 
+  cmDspSysInstallCb(h, off_rt,      "f-out-1", kr1,    "offs",    NULL );   // off->kr
299 299
300 300 
   cmDspSysInstallCb(h, inv_ctl,     "val",     inv_rt, "f-in",   NULL );
301 301 
   cmDspSysInstallCb(h, achan,       "ch",      inv_rt, "sel",    NULL );   // ach->rt sel
302 302 
   cmDspSysInstallCb(h, inv_rt,      "f-out-0", kr0,    "invt",   NULL );   // inv->kr
303 
-  //cmDspSysInstallCb(h, inv_rt,      "f-out-1", kr1,    "invt",   NULL );   // inv->kr
303 
+  cmDspSysInstallCb(h, inv_rt,      "f-out-1", kr1,    "invt",   NULL );   // inv->kr
304 304
305 305 
   cmDspSysInstallCb(h, min_wet_ctl, "val",     wet_sr, "min_out", NULL );
306 306 
   cmDspSysInstallCb(h, max_wet_ctl, "val",     wet_sr, "max_out", NULL );
 
@@ -313,7 +313,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
313 313 
   cmDspSysInstallCb(h, wet_ctl,     "val",     wet_rt, "f-in",    NULL );
314 314 
   cmDspSysInstallCb(h, achan,       "ch",      wet_rt, "sel",     NULL );   // ach->rt sel
315 315 
   cmDspSysInstallCb(h, wet_rt,      "f-out-0", kr0,    "wet",     NULL );   // wet->kr
316 
-  //cmDspSysInstallCb(h, wet_rt,      "f-out-1", kr1,    "wet",     NULL );   // wet->kr
316 
+  cmDspSysInstallCb(h, wet_rt,      "f-out-1", kr1,    "wet",     NULL );   // wet->kr
317 317
318 318
319 319 
   cmDspSysNewColumn(h,0);
 
@@ -368,9 +368,10 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpS
368 368 
   cmDspSysInstallCb(h, modp, mlbl("maxo"), max_off_ctl, "val", NULL );
369 369 
   cmDspSysInstallCb(h, modp, mlbl("sw"),   achan,       "trig", NULL ); // See also: amp.sfloc->achan.trig
370 370
371 
+
371 372 
   c->achan = achan;
372 373 
   c->kr0   = kr0;
373 
-  //c->kr1   = kr1;
374 
+  c->kr1   = kr1;
374 375 
   c->cmp   = cmp;
375 376
376 377 
 }
 
@@ -2071,7 +2072,7 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2071 2072 
   cmDspInst_t* mop  = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, r.midiDevice,r.midiOutPort);
2072 2073 
   cmDspInst_t* mo2p = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, r.midiDevice,r.midiOutPort2);
2073 2074 
   cmDspInst_t* sfp  = cmDspSysAllocInst(h,"ScFol",       NULL,  1, r.scFn, sfBufCnt, sfMaxWndCnt, sfMinVel, sfEnaMeasFl );
2074 
-  cmDspInst_t* amp  = cmDspSysAllocInst(h,"ActiveMeas",  NULL,  1, 100 );
2075 
+  //cmDspInst_t* amp  = cmDspSysAllocInst(h,"ActiveMeas",  NULL,  1, 100 );
2075 2076 
   cmDspInst_t* modp = cmDspSysAllocInst(h,"ScMod",       NULL,  2, r.modFn, "m1" );
2076 2077
2077 2078 
   unsigned   preGrpSymId     = cmDspSysPresetRegisterGroup(h,"tl");
 
@@ -2082,7 +2083,7 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2082 2083 
   cmDspSysNewPage(h,"Controls-0");
2083 2084 
   _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, modp, 0, 0 );
2084 2085 
   cmDspSysNewPage(h,"Controls-1");
2085 
-  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 0 );
2086 
+  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 1 );
2086 2087
2087 2088
2088 2089 
   cmDspInst_t* ao0p = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 2 );
 
@@ -2096,31 +2097,33 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2096 2097 
   cmDspInst_t* onb  = cmDspSysAllocInst(h,"Button", "start",   2, kButtonDuiId, 1.0 );
2097 2098 
   cmDspInst_t* offb = cmDspSysAllocInst(h,"Button", "stop",    2, kButtonDuiId, 1.0 );
2098 2099 
   cmDspInst_t* prp  = cmDspSysAllocInst(h,"Printer", NULL,   1, ">" );
2099 
-  cmDspInst_t* prd  = cmDspSysAllocInst(h,"Printer", NULL,   1, "DYN:" );
2100 
-  cmDspInst_t* pre  = cmDspSysAllocInst(h,"Printer", NULL,   1, "EVEN:" );
2101 
-  cmDspInst_t* prt  = cmDspSysAllocInst(h,"Printer", NULL,   1, "TEMPO:");
2102 
-  cmDspInst_t* prc  = cmDspSysAllocInst(h,"Printer", NULL,   1, "COST:");
2100 
+  //cmDspInst_t* prd  = cmDspSysAllocInst(h,"Printer", NULL,   1, "DYN:" );
2101 
+  //cmDspInst_t* pre  = cmDspSysAllocInst(h,"Printer", NULL,   1, "EVEN:" );
2102 
+  //cmDspInst_t* prt  = cmDspSysAllocInst(h,"Printer", NULL,   1, "TEMPO:");
2103 
+  //cmDspInst_t* prc  = cmDspSysAllocInst(h,"Printer", NULL,   1, "COST:");
2104 
+  cmDspInst_t* pra0  = cmDspSysAllocInst(h,"Printer", NULL,   1, "ACh0:");
2105 
+  cmDspInst_t* pra1  = cmDspSysAllocInst(h,"Printer", NULL,   1, "ACh1:");
2103 2106
2104 2107 
   // Record <-> Live switches
2105 
-  cmDspInst_t* tlRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);  // time line swich
2108 
+  cmDspInst_t* tlRt  = cmDspSysAllocInst(h,"Router", "tlRt", 2, 2, 0);  // time line swich
2106 2109 
   cmDspInst_t* wtRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2107 2110 
   cmDspInst_t* mfpRt = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2108 2111 
   cmDspInst_t* amRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2109 2112 
   cmDspInst_t* au0Sw = cmDspSysAllocInst(h,"1ofN",   NULL, 2, 2, 0);
2110 2113 
   cmDspInst_t* au1Sw = cmDspSysAllocInst(h,"1ofN",   NULL, 2, 2, 0);
2111 2114
2112 
-  cmDspInst_t* siRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2115 
+  cmDspInst_t* siRt  = cmDspSysAllocInst(h,"Router", "siRT", 2, 2, 0);
2113 2116 
   cmDspInst_t* muRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2114 2117 
   cmDspInst_t* d0Rt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2115 2118 
   cmDspInst_t* d1Rt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2116 2119 
   cmDspInst_t* stRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
2117 2120
2118 2121 
   cmDspSysNewColumn(h,0);
2119 
-  cmDspInst_t* igain0 = cmDspSysAllocInst(h,"Scalar", "In Gain-0",    5, kNumberDuiId, 0.0,   100.0,0.01,   0.0 );
2122 
+  cmDspInst_t* igain0 = cmDspSysAllocInst(h,"Scalar", "In Gain-0",    5, kNumberDuiId, 0.0,   100.0,0.01,   2.0 );
2120 2123
2121 2124
2122 2125 
   cmDspSysNewColumn(h,0);
2123 
-  cmDspInst_t* ogain0 = cmDspSysAllocInst(h,"Scalar", "Out Gain-0",   5, kNumberDuiId, 0.0,   10.0, 0.01,   0.0 );
2126 
+  cmDspInst_t* ogain0 = cmDspSysAllocInst(h,"Scalar", "Out Gain-0",   5, kNumberDuiId, 0.0,   10.0, 0.01,   3.0 );
2124 2127
2125 2128 
   /*
2126 2129 
   cmDspInst_t* ec_mu = cmDspSysAllocInst(h,"Scalar", "EC mu",        5, kNumberDuiId, 0.0,                   1.0,  0.01,   0.1 );  
@@ -2155,9 +2158,9 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2155 2158 
   cmDspSysNewColumn(h,0);
2156 2159
2157 2160 
   //--------------- Recorded performance evaluation and Active Measurement related controls
2158 
-  cmDspInst_t* clrBtn  = cmDspSysAllocButton( h, "clear",  0);
2159 
-  cmDspInst_t* prtBtn  = cmDspSysAllocButton( h, "dump",  0);
2160 
-  cmDspInst_t* mlst    = cmDspSysAllocInst(   h, "MsgList",   NULL, 3, "meas", r.measFn, 2);
2161 
+  //cmDspInst_t* clrBtn  = cmDspSysAllocButton( h, "clear",  0);
2162 
+  //cmDspInst_t* prtBtn  = cmDspSysAllocButton( h, "dump",  0);
2163 
+  //cmDspInst_t* mlst    = cmDspSysAllocInst(   h, "MsgList",   NULL, 3, "meas", r.measFn, 2);
2161 2164 
   cmDspInst_t* amCmd   = cmDspSysAllocInst(   h, "PortToSym", NULL, 2, "add", "rewind" );
2162 2165
2163 2166 
 
@@ -2177,8 +2180,8 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2177 2180 
   // Audio connections
2178 2181 
   cmDspSysConnectAudio(h, ai0p,   "out", mi0p, "in");    // ain -> meter
2179 2182 
   cmDspSysConnectAudio(h, ai0p,   "out", c0.kr0, "in" ); // ain -> kr
2183 
+  cmDspSysConnectAudio(h, ai0p,   "out", c0.kr1, "in" );
2180 2184 
   //cmDspSysConnectAudio(h, ai0p,   "out", ec0, "f_in" );  // ain -> echo_cancel
2181 
-
2182 2185 
   //cmDspSysConnectAudio(h, c0.cmp, "out", ec0,  "uf_in" ); // kr -> echo_cancel
2183 2186 
   //cmDspSysConnectAudio(h, ec0,    "out", ao0p, "in"  );   // ec -> aout 0
2184 2187 
   cmDspSysConnectAudio(h, c0.cmp,   "out", ao0p, "in" ); // kr -> echo_cancel
 
@@ -2187,17 +2190,18 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2187 2190
2188 2191 
   cmDspSysConnectAudio(h, ai1p,   "out", mi1p, "in");    // ain -> meter
2189 2192 
   cmDspSysConnectAudio(h, ai1p,   "out", c1.kr0, "in" ); // ain -> kr
2193 
+  cmDspSysConnectAudio(h, ai1p,   "out", c1.kr1, "in" );
2190 2194 
   //cmDspSysConnectAudio(h, ai1p,   "out", ec1, "f_in" );  // ain -> echo_cancel
2191 
-
2192 
-
2193 2195 
   //cmDspSysConnectAudio(h, c1.cmp, "out", ec1,  "uf_in" ); // kr -> echo_cancel
2194 2196 
   //cmDspSysConnectAudio(h, ec1,    "out", ao1p, "in"  );   // ec -> aout 0
2195 2197 
   cmDspSysConnectAudio(h, c1.cmp, "out", ao1p,  "in" ); // kr -> echo_cancel
2196 2198 
   cmDspSysConnectAudio(h, c1.cmp, "out", afop, "in1");
2197 2199 
   cmDspSysConnectAudio(h, c1.cmp, "out", mo1p, "in" );   //
2198 2200
2201 
+  /*
2199 2202 
   cmDspSysInstallCb( h, clrBtn, "sym",    amp, "cmd",   NULL ); // clear active meas.
2200 2203 
   cmDspSysInstallCb( h, prtBtn, "sym",    amp, "cmd",   NULL ); // print active meas
2204 
+  cmDspSysInstallCb( h, prtBtn, "sym",    modp,"cmd",   NULL ); // print modulator
2201 2205 
   cmDspSysInstallCb( h, amCmd, "add",     amp, "cmd",   NULL ); // add active meas
2202 2206 
   cmDspSysInstallCb( h, amCmd, "rewind",  amp, "cmd",   NULL ); // rewind active meas
2203 2207 
   cmDspSysInstallCb( h, mlst,   "loc",    amp, "loc",   NULL ); // recorded meas's list to active meas unit
 
@@ -2213,6 +2217,9 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2213 2217 
   cmDspSysInstallCb( h, sfp, "vcost",amp,   "cst",  NULL ); //
2214 2218 
   cmDspSysInstallCb( h, sfp, "vtyp", amp,   "type", NULL ); //
2215 2219 
   cmDspSysInstallCb( h, sfp, "vtyp", amCmd, "add",  NULL);  //
2220 
+  */
2221 
+
2222 
+  /*
2216 2223
2217 2224 
   // ***** delete this to prevent the score follower from driving the active-measure unit in 'live' mode
2218 2225 
   cmDspSysInstallCb( h, amRt,   "f-out-1",amp, "sfloc", NULL );
 
@@ -2220,12 +2227,13 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2220 2227
2221 2228 
   // active measure loc to xfad channel trigger
2222 2229 
   cmDspSysInstallCb( h, amp,    "scloc",  c0.achan,   "trig", NULL );  // See Also: modp.sw ->achan.trig
2230 
+  cmDspSysInstallCb( h, amp,    "scloc",  c1.achan,   "trig", NULL );  // See Also: modp.sw ->achan.trig
2223 2231
2224 2232 
   cmDspSysInstallCb( h, amp,    "even",   pre,        "in",   NULL );  // active meas output to printers
2225 2233 
   cmDspSysInstallCb( h, amp,    "dyn",    prd,        "in",   NULL );
2226 2234 
   cmDspSysInstallCb( h, amp,    "tempo",  prt,        "in",   NULL );
2227 2235 
   cmDspSysInstallCb( h, amp,    "cost",   prc,        "in",   NULL );
2228 
-
2236 
+  */
2229 2237
2230 2238 
   // 'live' button -> live router selector switch
2231 2239 
   cmDspSysInstallCb(h, liveb, "out",  wtRt, "sel", NULL );
 
@@ -2264,6 +2272,10 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2264 2272 
   cmDspSysInstallCb(h, pts, "on",      modp,     "cmd",   NULL );
2265 2273 
   cmDspSysInstallCb(h, onb, "sym",     amCmd,   "rewind",NULL );
2266 2274 
   cmDspSysInstallCb(h, onb, "out",     c0.achan,"reset",  NULL );
2275 
+  cmDspSysInstallCb(h, onb, "out",     c1.achan,"reset",  NULL );
2276 
+
2277 
+  cmDspSysInstallCb(h, c0.achan, "ch",     pra0, "in",  NULL );
2278 
+  cmDspSysInstallCb(h, c1.achan, "ch",     pra1, "in",  NULL );
2267 2279
2268 2280 
   // stop connections
2269 2281 
   cmDspSysInstallCb(h, offb, "sym",  pts,  "off",   NULL );
 
@@ -2295,8 +2307,8 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2295 2307
2296 2308 
   cmDspSysInstallCb(h, rndr,  "d0",      d0Rt,  "f-in", NULL );
2297 2309 
   cmDspSysInstallCb(h, d0Rt, "f-out-1", sfp,   "d0",   NULL );
2298 
-  cmDspSysInstallCb(h, d0Rt, "f-out-1", nmp,  "d0",   NULL );
2299 
-  cmDspSysInstallCb(h, nmp,  "d0",      mop,  "d0",   NULL );
2310 
+  cmDspSysInstallCb(h, d0Rt, "f-out-1", nmp,   "d0",   NULL );
2311 
+  cmDspSysInstallCb(h, nmp,  "d0",      mop,   "d0",   NULL );
2300 2312 
   cmDspSysInstallCb(h, nmp,  "d0",      mo2p,  "d0",   NULL );
2301 2313
2302 2314 
   cmDspSysInstallCb(h, rndr, "status",   stRt, "f-in",  NULL );
 
@@ -2312,6 +2324,7 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
2312 2324 
   cmDspSysInstallCb(h, sfp, "recent",  prp,     "in",  NULL );  // report 'recent' but only act on 'max' loc index
2313 2325
2314 2326 
   cmDspSysInstallCb(h, igain0, "val", ai0p, "gain", NULL );   // input gain control
2327 
+  cmDspSysInstallCb(h, igain0, "val", ai1p, "gain", NULL );   // input gain control
2315 2328
2316 2329 
   /*
2317 2330 
   cmDspSysInstallCb(h, ec_mu, "val", ec0, "mu",     NULL );

Write Preview
Loading…
Cancel
Save