Re-enabled performance measurement code. Replaced cmDspPgmKrChain.c with cmDspPgmKrChain2.c

Makefile.am

@@ -57,8 +57,8 @@ cmSRC += src/libcm/dsp/cmDspStore.c src/libcm/dsp/cmDspBuiltIn.c  src/libcm/dsp/
 cmHDR += src/libcm/dsp/cmDspPgm.h src/libcm/dsp/cmDspPgmPP.h src/libcm/dsp/cmDspPgmPPMain.h
 cmSRC += src/libcm/dsp/cmDspPgm.c src/libcm/dsp/cmDspPgmPP.c src/libcm/dsp/cmDspPgmPPMain.c
 
-cmHDR +=  src/libcm/dsp/cmDspKr.h src/libcm/dsp/cmDspPgmKr.h  src/libcm/dsp/cmDspPgmKrChain.h 
-cmSRC +=  src/libcm/dsp/cmDspKr.c src/libcm/dsp/cmDspPgmKr.c  src/libcm/dsp/cmDspPgmKrChain.c src/libcm/dsp/cmDspPgmKrTksb.c src/libcm/dsp/cmDspPgmKrTimeLineLite.c
+cmHDR +=  src/libcm/dsp/cmDspKr.h src/libcm/dsp/cmDspPgmKr.h  src/libcm/dsp/cmDspPgmKrChain.h  
+cmSRC +=  src/libcm/dsp/cmDspKr.c src/libcm/dsp/cmDspPgmKr.c  src/libcm/dsp/cmDspPgmKrChain2.c src/libcm/dsp/cmDspPgmKrTksb.c src/libcm/dsp/cmDspPgmKrTimeLineLite.c
 
 cmHDR += src/libcm/cmAudDsp.h src/libcm/cmAudDspIF.h src/libcm/cmAudDspLocal.h
 cmSRC += src/libcm/cmAudDsp.c src/libcm/cmAudDspIF.c src/libcm/cmAudDspLocal.c

cmProc4.c

@@ -1981,6 +1981,7 @@ typedef struct
   unsigned smpIdx;   // time of assoc'd MIDI event
   unsigned cnt;      // 
   double   val;      //
+  unsigned pitch;
 } _cmScMeasTimeEle_t;
 
 typedef struct
@@ -2050,7 +2051,7 @@ unsigned _cmScMeasTimeAlign( cmScMeas* p, cmScMeasSet_t* sp, cmScMatchMidi_t* m,
         {
           a[j].smpIdx += m[i].smpIdx;
           a[j].cnt    += 1;
-
+          a[j].pitch   = m[i].pitch;
           if( a[j].cnt == 1 )
             matchN += 1;  // only cnt one match per sc loc.
           break;
@@ -2139,7 +2140,10 @@ double _cmScMeasEven( cmScMeas* p, cmScMeasSet_t* sp, cmScMatchMidi_t* m, unsign
   // calc avg. delta time
   double d_avg  = 0;
   for(i=0; i<bn-1; ++i)
+  {
     d_avg  += b[i].val;
+    //printf("loc:%i %f\n",b[i].scLocIdx,b[i].val);
+  }
 
   d_avg /= (bn-1);
 
@@ -3360,27 +3364,18 @@ cmRC_t _cmScModExecCross( cmScModulator* p, cmScModEntry_t* ep )
 {
   cmRC_t rc = cmOkRC;
   double x  = 0.0;
-  //double x0 = 0.0, x1 = 0.0;
   double y0 = 0.0, y1 = 0.0;
 
   if((rc = _cmScModGetCrossParam(p, ep, &ep->arg, "src var", &x )) != cmOkRC )
     return rc;
     
-  //if((rc = _cmScModGetCrossParam(p, ep, &ep->beg, "src min", &x0 )) != cmOkRC )
-  //  return rc;
-
-  //if((rc = _cmScModGetCrossParam(p, ep, &ep->end, "src max", &x1 )) != cmOkRC )
-  //  return rc;
-  
   if((rc = _cmScModGetCrossParam(p, ep, &ep->min, "dst min", &y0 )) != cmOkRC )
     return rc;
   
   if((rc = _cmScModGetCrossParam(p, ep, &ep->max, "dst max", &y1 )) != cmOkRC )
     return rc;
 
-  //double xx = x0 + (x-x0) / (x1-x0);
-
-  printf("%s x:%f y0:%f y1:%f\n",__FUNCTION__,x,y0,y1);
+  //printf("%s x:%f y0:%f y1:%f\n",__FUNCTION__,x,y0,y1);
   
   ep->varPtr->value =  y0 + x * (y1-y0);
 

dsp/cmDspKr.c

@@ -1649,7 +1649,7 @@ cmDspRC_t _cmDspScModRecv(cmDspCtx_t* ctx, cmDspInst_t* inst, const cmDspEvt_t*
   if( p->minInVarId <= evt->dstVarId && evt->dstVarId <= p->maxInVarId )
   {
     double v = cmDspDouble(inst,evt->dstVarId);
-    printf("%s : %i %f\n",__FUNCTION__,evt->dstVarId,v);
+    //printf("%s : %i %f\n",__FUNCTION__,evt->dstVarId,v);
     cmScModulatorSetValue( p->mp, p->inVarIdMap[ evt->dstVarId - p->inVarIdOffs ], v );
   }
   

dsp/cmDspPgmKr.c

@@ -167,12 +167,12 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
   cmDspTlXform_t c0,c1,c2,c3;
 
   cmDspSysNewPage(h,"Controls-0");
-  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, modp, 0, 0 );
+  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, amp, modp, 0, 0 );
 
   if( useChain1Fl )
   {
     cmDspSysNewPage(h,"Controls-1");
-    _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 1 );
+    _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, amp, modp, 1, 1 );
   }
 
   cmDspInst_t* mix0 = NULL;
@@ -181,10 +181,10 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
   if( fragFl )
   {
     cmDspSysNewPage(h,"Ctl-R/P-0");
-    _cmDspSys_TlXformChain(h, &c2, preGrpSymId, cmpPreGrpSymId, modr, 2, 0 );
+    _cmDspSys_TlXformChain(h, &c2, preGrpSymId, cmpPreGrpSymId, amp, modr, 2, 0 );
 
     cmDspSysNewPage(h,"Ctl-R/P-1");
-    _cmDspSys_TlXformChain(h, &c3, preGrpSymId, cmpPreGrpSymId, modr, 3, 1 );
+    _cmDspSys_TlXformChain(h, &c3, preGrpSymId, cmpPreGrpSymId, amp, modr, 3, 1 );
 
     mix0 = cmDspSysAllocInst(h,"AMix",        NULL,   3, 2, 1.0, 1.0 );
     mix1 = cmDspSysAllocInst(h,"AMix",        NULL,   3, 2, 1.0, 1.0 );

dsp/cmDspPgmKrChain.h

@@ -31,7 +31,6 @@ typedef struct
   cmDspInst_t* kr0;  // audio input
   cmDspInst_t* kr1;
   cmDspInst_t* cmp;  // audio output
-  cmDspInst_t* even_ctl;
 } cmDspTlXform_t;
 
 
@@ -40,6 +39,7 @@ void _cmDspSys_TlXformChain(
   cmDspTlXform_t* c,
   unsigned        preGrpSymId,
   unsigned        cmpPreGrpSymId,
+  cmDspInst_t*    amp,
   cmDspInst_t*    modp,
   unsigned        ach,
   unsigned        mch );

dsp/cmDspPgmKrChain2.c

@@ -0,0 +1,279 @@
+#include "cmPrefix.h"
+#include "cmGlobal.h"
+#include "cmFloatTypes.h"
+#include "cmRpt.h"
+#include "cmErr.h"
+#include "cmCtx.h"
+#include "cmMem.h"
+#include "cmMallocDebug.h"
+#include "cmLinkedHeap.h"
+#include "cmText.h"
+#include "cmFileSys.h"
+#include "cmSymTbl.h"
+#include "cmJson.h"
+#include "cmPrefs.h"
+#include "cmDspValue.h"
+#include "cmMsgProtocol.h"
+#include "cmThread.h"
+#include "cmUdpPort.h"
+#include "cmUdpNet.h"
+#include "cmTime.h"
+#include "cmAudioSys.h"
+#include "cmProcObj.h"
+#include "cmDspCtx.h"
+#include "cmDspClass.h"
+#include "cmDspSys.h"
+#include "cmDspPgm.h"
+
+
+#include "cmAudioFile.h"
+#include "cmProcObj.h"
+#include "cmProc.h"
+#include "cmProc3.h"
+
+#include "cmVectOpsTemplateMain.h"
+#include "cmVectOps.h"
+
+#include "cmDspPgmKrChain.h"
+
+#undef KR2
+
+
+cmDspRC_t krLoadRsrc(cmDspSysH_t h, cmErr_t* err, krRsrc_t* r)
+{
+  cmDspRC_t rc;
+  if((rc = cmDspSysLastRC(h)) != kOkDspRC )
+    return rc;
+
+  cmDspRsrcString(h,&r->tlFn,        "timeLineFn",   NULL);
+  cmDspRsrcString(h,&r->tlPrefixPath,"tlPrefixPath", NULL);
+  cmDspRsrcString(h,&r->scFn,        "scoreFn",      NULL);
+  cmDspRsrcString(h,&r->tksbFn,      "tksbFn",       NULL);
+  cmDspRsrcString(h,&r->modFn,       "modFn",        NULL);
+  cmDspRsrcString(h,&r->measFn,      "measFn",       NULL);
+  cmDspRsrcString(h,&r->recordDir,   "recordDir",    NULL);
+  cmDspRsrcString(h,&r->midiDevice,  "midiDevice",   NULL);
+  cmDspRsrcString(h,&r->midiOutPort, "midiOutPort",  NULL);
+  cmDspRsrcString(h,&r->midiOutPort2,"midiOutPort2", NULL);
+
+  if((rc = cmDspSysLastRC(h)) != kOkDspRC )
+    cmErrMsg(err,rc,"A KR DSP resource load failed.");
+    
+  return rc;
+}
+
+
+const cmChar_t* _mlbl(const cmChar_t* prefix, unsigned ch )
+{
+  static char s[128];
+  s[127]=0;
+  snprintf(s,127,"%s%i",prefix,ch);
+  return s;
+}
+
+#define mlbl(a)  _mlbl(a,mch)
+#define lbl(a) cmDspSysPrintLabel(a,ach)
+
+void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c,  unsigned preGrpSymId, unsigned cmpPreGrpSymId, cmDspInst_t* amp, cmDspInst_t* modp, unsigned ach, unsigned mch )
+{
+    
+  int             krWndSmpCnt = 2048;
+  int             krHopFact   = 4;
+
+  unsigned        xfadeChCnt  = 2;
+  double          xfadeMs     = 50;
+  bool            xfadeInitFl = true;
+  double          mixGain     = 1.0;
+
+  bool            cmpBypassFl  = false;
+  double          cmpInGain    = 3.0;
+  double          cmpThreshDb  = -40.0;
+  double          cmpRatio_num = 5.0;
+  double          cmpAtkMs     = 20.0;
+  double          cmpRlsMs     = 100.0;
+  double          cmpMakeup    = 1.0;
+  double          cmpWndMaxMs  = 1000.0;
+  double          cmpWndMs     = 200.0;
+
+
+  cmDspInst_t* achan = cmDspSysAllocInst(h, "AvailCh",     NULL, 1, xfadeChCnt );
+  
+
+ 
+  // Parameter-> kr routers (routers used to cross-fade between the two kr units)
+  unsigned paramRtChCnt = 2;
+  cmDspInst_t* wnd_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* hop_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* cel_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* exp_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* mix_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* thr_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* upr_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* lwr_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+  cmDspInst_t* wet_rt   = cmDspSysAllocInst(h, "Router",      NULL,  2,  paramRtChCnt, paramRtChCnt-1 );
+
+  // Audio processors
+  cmDspInst_t* kr0  = cmDspSysAllocInst(h, "Kr2",        NULL,   2, krWndSmpCnt, krHopFact );
+  cmDspInst_t* kr1  = cmDspSysAllocInst(h, "Kr2",        NULL,   2, krWndSmpCnt, krHopFact );
+  cmDspInst_t* xfad = cmDspSysAllocInst(h, "Xfader",     NULL,   3, xfadeChCnt,  xfadeMs, xfadeInitFl ); 
+  cmDspInst_t* mix  = cmDspSysAllocInst(h, "AMix",       NULL,   3, xfadeChCnt,  mixGain, mixGain );
+  cmDspInst_t* cmp  = cmDspSysAllocInst(h, "Compressor", NULL,   8, cmpBypassFl, cmpThreshDb, cmpRatio_num, cmpAtkMs, cmpRlsMs, cmpMakeup, cmpWndMs, cmpWndMaxMs ); 
+
+  // Internal audio connections
+  cmDspSysConnectAudio(h, kr0,  "out",   xfad, "in-0");
+  cmDspSysConnectAudio(h, kr1,  "out",   xfad, "in-1");
+  cmDspSysConnectAudio(h, xfad, "out-0", mix,  "in-0");
+  cmDspSysConnectAudio(h, xfad, "out-1", mix,  "in-1");
+  cmDspSysConnectAudio(h, mix,  "out",   cmp,  "in" );
+
+  // active channel <-> cross-fade connections
+  cmDspSysInstallCb(h, achan,  "reset",   xfad, "reset", NULL);
+  cmDspSysInstallCb(h, achan,  "gate-0",  xfad, "gate-0", NULL );
+  cmDspSysInstallCb(h, achan,  "gate-1",  xfad, "gate-1", NULL );
+  cmDspSysInstallCb(h, xfad,   "state-0", achan, "dis-0",  NULL );
+  cmDspSysInstallCb(h, xfad,   "state-1", achan, "dis-1",  NULL );
+
+  
+  //  Measurement Number Controls
+  cmDspInst_t* val_dynm_ctl   = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Dynm Meas"),       0.0, 10.0, 1.0, 1.0);  
+  cmDspInst_t* val_even_ctl   = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Even Meas"),      0.0, 3.0, 0.001, 0.5);  
+  cmDspInst_t* val_tmpo_ctl   = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Tempo Meas"),     0.0, 200.0, 1.0, 100.0);  
+  cmDspInst_t* val_cost_ctl   = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Cost Meas"),        0.0, 1.0, 0.01, 0.5);  
+
+  // active measure to measurement UI controls
+  cmDspSysInstallCb(h, amp,          "dyn",    val_dynm_ctl,  "val", NULL );
+  cmDspSysInstallCb(h, amp,          "even",    val_even_ctl,  "val", NULL );
+  cmDspSysInstallCb(h, amp,          "tempo",   val_tmpo_ctl,  "val", NULL );
+  cmDspSysInstallCb(h, amp,          "cost",    val_cost_ctl,  "val", NULL );
+
+  // measurement UI controls to scMod
+  cmDspSysInstallCb(h, val_dynm_ctl, "val",     modp, "dyn",  NULL );  
+  cmDspSysInstallCb(h, val_even_ctl, "val",     modp, "even",  NULL );  
+  cmDspSysInstallCb(h, val_tmpo_ctl, "val",     modp, "tempo", NULL );
+  cmDspSysInstallCb(h, val_cost_ctl, "val",     modp, "cost",  NULL );
+
+  
+  // Parameter number controls 
+  cmDspSysNewColumn(h,0);
+  cmDspInst_t* wnd_ctl = cmDspSysAllocMsgListP(h,preGrpSymId,NULL, lbl("WndSmpCnt"), NULL, "wndSmpCnt", 2);
+  cmDspInst_t* hop_ctl = cmDspSysAllocMsgListP(h,preGrpSymId,NULL, lbl("HopFact"),   NULL, "hopFact",   2);
+  cmDspInst_t* cel_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Ceiling"),   0.0, 100.0, 0.1,  30.0 );
+  cmDspInst_t* exp_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Expo"),    -10.0,  10.0, 0.01,  2.0 );
+  cmDspInst_t* mix_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Mix"),       0.0,   1.0, 0.01,  0.0 );    
+  cmDspInst_t* thr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Threshold"), 0.0, 100.0, 1.0,  60.0 );
+  cmDspInst_t* upr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Upr slope"), 0.0,  10.0, 0.01,  0.0 ); 
+  cmDspInst_t* lwr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Lwr slope"), 0.3,  10.0, 0.01,  2.0 );
+  cmDspInst_t* wet_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Wet Dry"),   0.0,   1.0, 0.001, 1.0 );
+
+  
+  cmDspSysInstallCb(h, wnd_ctl, "out",         wnd_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,   "ch",          wnd_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, wnd_rt,  "f-out-0",     kr0,    "wndn",    NULL );   // wndn->kr
+  cmDspSysInstallCb(h, wnd_rt,  "f-out-1",     kr1,    "wndn",    NULL );   // wndn->kr
+
+  cmDspSysInstallCb(h, hop_ctl, "out",         hop_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,   "ch",          hop_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, hop_rt,  "f-out-0",     kr0,    "hopf",    NULL );   // hopf->kr
+  cmDspSysInstallCb(h, hop_rt,  "f-out-1",     kr1,    "hopf",    NULL );   // hopf->kr
+  
+  cmDspSysInstallCb(h, thr_ctl,     "val",     thr_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      thr_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, thr_rt,      "f-out-0", kr0,    "thrh",    NULL );   // thr->kr
+  cmDspSysInstallCb(h, thr_rt,      "f-out-1", kr1,    "thrh",    NULL );   // thr->kr
+
+  cmDspSysInstallCb(h, upr_ctl,     "val",     upr_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      upr_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, upr_rt,      "f-out-0", kr0,    "uprs",    NULL );   // upr->kr
+  cmDspSysInstallCb(h, upr_rt,      "f-out-1", kr1,    "uprs",    NULL );   // upr->kr
+
+  cmDspSysInstallCb(h, lwr_ctl,     "val",     lwr_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      lwr_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, lwr_rt,      "f-out-0", kr0,    "lwrs",    NULL );   // lwr->kr
+  cmDspSysInstallCb(h, lwr_rt,      "f-out-1", kr1,    "lwrs",    NULL );   // lwr->kr
+  
+  cmDspSysInstallCb(h, wet_ctl,     "val",     wet_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      wet_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, wet_rt,      "f-out-0", kr0,    "wet",     NULL );   // wet->kr
+  cmDspSysInstallCb(h, wet_rt,      "f-out-1", kr1,    "wet",     NULL );   // wet->kr
+
+  cmDspSysInstallCb(h, cel_ctl,     "val",     cel_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      cel_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, cel_rt,      "f-out-0", kr0,    "ceil",    NULL );   // cel->kr
+  cmDspSysInstallCb(h, cel_rt,      "f-out-1", kr1,    "ceil",    NULL );   // cel->kr
+
+  cmDspSysInstallCb(h, exp_ctl,     "val",     exp_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      exp_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, exp_rt,      "f-out-0", kr0,    "expo",    NULL );   // exp->kr
+  cmDspSysInstallCb(h, exp_rt,      "f-out-1", kr1,    "expo",    NULL );   // exp->kr
+
+  cmDspSysInstallCb(h, mix_ctl,     "val",     mix_rt, "f-in",    NULL );
+  cmDspSysInstallCb(h, achan,       "ch",      mix_rt, "sel",     NULL );   // ach->rt sel
+  cmDspSysInstallCb(h, mix_rt,      "f-out-0", kr0,    "mix",    NULL );   // mix->kr
+  cmDspSysInstallCb(h, mix_rt,      "f-out-1", kr1,    "mix",    NULL );   // mix->kr
+  
+  
+
+  cmDspSysNewColumn(h,0);
+  cmDspInst_t* cmp_byp   = cmDspSysAllocCheckP(  h, cmpPreGrpSymId, NULL, lbl("Bypass"), 1.0 );
+  cmDspInst_t* cmp_igain = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("In Gain"),  0.0,   10.0, 0.1, cmpInGain);
+  cmDspInst_t* cmp_thr   = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("ThreshDb"), -100.0, 0.0, 0.1, cmpThreshDb);
+  cmDspInst_t* cmp_rat   = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("Ratio"),    0.1, 100, 0.1, cmpRatio_num);
+  cmDspInst_t* cmp_atk   = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("Atk Ms"),   0.0, 1000.0, 0.1, cmpAtkMs);
+  cmDspInst_t* cmp_rls   = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("Rls Ms"),   0.0, 1000.0, 0.1, cmpRlsMs);
+  cmDspInst_t* cmp_mkup  = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("Makeup"),   0.0, 10.0,   0.01, cmpMakeup);
+  cmDspInst_t* cmp_wnd   = cmDspSysAllocScalarP( h, cmpPreGrpSymId, NULL, lbl("Wnd Ms"),   1.0, cmpWndMaxMs, 1.0, cmpWndMs );
+  cmDspInst_t* cmp_mtr   = cmDspSysAllocInst(h,"Meter",lbl("Env"), 3, 0.0, 0.0, 1.0);
+
+  cmDspSysInstallCb(h, cmp_byp,  "out", cmp, "bypass", NULL );
+  cmDspSysInstallCb(h, cmp_igain,"val", cmp, "igain", NULL );
+  cmDspSysInstallCb(h, cmp_thr,  "val", cmp, "thr", NULL );
+  cmDspSysInstallCb(h, cmp_rat,  "val", cmp, "ratio", NULL );
+  cmDspSysInstallCb(h, cmp_atk,  "val", cmp, "atk", NULL );
+  cmDspSysInstallCb(h, cmp_rls,  "val", cmp, "rls", NULL );
+  cmDspSysInstallCb(h, cmp_mkup, "val", cmp, "ogain", NULL );
+  cmDspSysInstallCb(h, cmp_wnd,  "val", cmp, "wnd", NULL );
+  cmDspSysInstallCb(h, cmp,      "env", cmp_mtr, "in", NULL );
+
+  cmDspSysInstallCb(h, modp, mlbl("cbyp"),    cmp_byp,  "in", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("cigain"),  cmp_igain,"val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("cthrsh"),  cmp_thr,  "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("cratio"),  cmp_rat,  "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("catkms"),  cmp_atk,  "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("crlsms"),  cmp_rls,  "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("cmakeup"), cmp_mkup, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("cwndms"),  cmp_wnd,  "val", NULL );
+
+  // 
+  cmDspInst_t* xfadMs = cmDspSysAllocInst(h,"Scalar", lbl("Xfade Ms"),     5, kNumberDuiId, 0.0,   1000.0,0.01, 50.0 );  
+  cmDspSysInstallCb(h, xfadMs, "val", xfad, "ms", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("xfad"), xfadMs,  "val", NULL);
+
+  //cmDspInst_t* sw_btn = cmDspSysAllocButton( h, lbl("switch"), 0);
+  //cmDspSysInstallCb( h, sw_btn, "sym",  achan, "trig", NULL ); 
+
+  
+  
+  // TODO: FIX THIS: can't send window length (e.g. 1024,2048, ... ) to a 'MsgList' with 4 elements
+  // since it expects an index betweeen 0 and 3.  CRASH!
+  //cmDspSysInstallCb(h, modp, mlbl("win"),  wnd_ctl, "sel",  NULL );
+
+  
+  cmDspSysInstallCb(h, modp, mlbl("hop"),  hop_ctl, "sel", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("ceil"), cel_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("expo"), exp_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("mix"),  mix_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("thr"),  thr_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("upr"),  upr_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("lwr"),  lwr_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("wet"),  wet_ctl, "val", NULL );
+  cmDspSysInstallCb(h, modp, mlbl("sw"),   achan,       "trig", NULL ); // See also: amp.sfloc->achan.trig
+
+  
+  c->achan = achan; 
+  c->kr0   = kr0; 
+  c->kr1   = kr1;
+  c->cmp   = cmp;
+
+}
+
+

dsp/cmDspPgmKrTimeLineLite.c

@@ -58,8 +58,6 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
   if( krLoadRsrc(h,&err,&r) != kOkDspRC )
     return rc;
 
-  
-
   cmDspInst_t* ai0 = cmDspSysAllocInst(h,"AudioIn",     NULL,  1, 0);
   cmDspInst_t* ai1 = cmDspSysAllocInst(h,"AudioIn",     NULL,  1, 1);
   //cmDspInst_t* mip = cmDspSysAllocInst(h,"MidiIn",      NULL,  2, "MOTU - Traveler mk3", "MIDI Port");
@@ -83,16 +81,16 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
   cmDspTlXform_t c0,c1;
 
   cmDspSysNewPage(h,"Controls-0");
-  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, modp, 0, 0 );
+  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, amp, modp, 0, 0 );
 
   cmDspSysNewPage(h,"Controls-1");
-  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 1 );
+  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, amp, modp, 1, 1 );
 
 
   cmDspInst_t* ao0 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 4 ); // 4 Piano     1 Output
   cmDspInst_t* ao1 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 5 ); // 5          2
-  cmDspInst_t* ao2 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 0 ); // 2 Transform 1 OUtput
-  cmDspInst_t* ao3 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 1 ); // 3          2
+  cmDspInst_t* ao2 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 2 ); // 2 Transform 1 OUtput
+  cmDspInst_t* ao3 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 3 ); // 3          2
 
   cmDspSysNewPage(h,"Main");
   cmDspInst_t* onb     = cmDspSysAllocInst(h,"Button", "start",   2, kButtonDuiId, 1.0 );
@@ -202,15 +200,14 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
   // *****
 
   // active measure loc to xfad channel trigger
- 
+  /*
   cmDspSysInstallCb( h, amp,       "scloc",c0.achan, "trig", NULL );  // See Also: modp.sw ->achan.trig
   cmDspSysInstallCb( h, amp,       "scloc",c1.achan, "trig", NULL );
   cmDspSysInstallCb( h, recallBtn, "sym",  c0.achan, "trig", NULL ); 
   cmDspSysInstallCb( h, recallBtn, "sym",  c1.achan, "trig", NULL );
+  */
   
   cmDspSysInstallCb( h, amp,    "even",   pre,        "in",   NULL );  // active meas output to printers
-  //cmDspSysInstallCb( h, amp,    "even",   c0.even_ctl,  "val",   NULL );  
-  //cmDspSysInstallCb( h, amp,    "even",   c1.even_ctl,  "val",   NULL );
   cmDspSysInstallCb( h, amp,    "even",   modp,       "even", NULL );
 
   cmDspSysInstallCb( h, amp,    "dyn",    prd,        "in",   NULL );
@@ -304,8 +301,8 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
   cmDspSysInstallCb(h, modp, "wgain0",  ogain2, "val",  NULL );
   cmDspSysInstallCb(h, modp, "wgain1",  ogain3, "val",  NULL );
 
-  //cmDspSysInstallCb(h, ogain0, "val", ao0, "gain", NULL );   // output gain control - dry 0
-  //cmDspSysInstallCb(h, ogain1, "val", ao1, "gain", NULL );   //                       dry 1
+  cmDspSysInstallCb(h, ogain0, "val", ao0, "gain", NULL );   // output gain control - dry 0
+  cmDspSysInstallCb(h, ogain1, "val", ao1, "gain", NULL );   //                       dry 1
   cmDspSysInstallCb(h, ogain2, "val", ao2, "gain", NULL );   //                       wet 0
   cmDspSysInstallCb(h, ogain3, "val", ao3, "gain", NULL );   //                       wet 1
 

dsp/cmDspPgmKrTksb.c

@@ -162,12 +162,12 @@ cmDspRC_t _cmDspSysPgm_Tksb(cmDspSysH_t h, void** userPtrPtr )
   cmDspTlXform_t c0,c1,c2,c3;
 
   cmDspSysNewPage(h,"Controls-0");
-  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, modp, 0, 0 );
+  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, amp, modp, 0, 0 );
 
   if( useChain1Fl )
   {
     cmDspSysNewPage(h,"Controls-1");
-    _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 1 );
+    _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, amp, modp, 1, 1 );
   }
 
   cmDspInst_t* mix0 = NULL;
@@ -176,10 +176,10 @@ cmDspRC_t _cmDspSysPgm_Tksb(cmDspSysH_t h, void** userPtrPtr )
   if( fragFl )
   {
     cmDspSysNewPage(h,"Ctl-R/P-0");
-    _cmDspSys_TlXformChain(h, &c2, preGrpSymId, cmpPreGrpSymId, modr, 2, 0 );
+    _cmDspSys_TlXformChain(h, &c2, preGrpSymId, cmpPreGrpSymId, amp, modr, 2, 0 );
 
     cmDspSysNewPage(h,"Ctl-R/P-1");
-    _cmDspSys_TlXformChain(h, &c3, preGrpSymId, cmpPreGrpSymId, modr, 3, 1 );
+    _cmDspSys_TlXformChain(h, &c3, preGrpSymId, cmpPreGrpSymId, amp, modr, 3, 1 );
 
     mix0 = cmDspSysAllocInst(h,"AMix",        NULL,   3, 2, 1.0, 1.0 );
     mix1 = cmDspSysAllocInst(h,"AMix",        NULL,   3, 2, 1.0, 1.0 );
@@ -920,9 +920,9 @@ cmDspRC_t _cmDspSysPgm_TksbLite(cmDspSysH_t h, void** userPtrPtr )
   cmDspTlXform_t c0,c1;
 
   cmDspSysNewPage(h,"Controls-0");
-  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, modp, 0, 0 );
+  _cmDspSys_TlXformChain(h, &c0, preGrpSymId, cmpPreGrpSymId, NULL, modp, 0, 0 );
   cmDspSysNewPage(h,"Controls-1");
-  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, modp, 1, 1 );
+  _cmDspSys_TlXformChain(h, &c1, preGrpSymId, cmpPreGrpSymId, NULL, modp, 1, 1 );
 
 
   cmDspInst_t* ao0p = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 2 );