|
@@ -75,7 +75,8 @@ const cmChar_t* _mlbl(const cmChar_t* prefix, unsigned ch )
|
75
|
75
|
void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpSymId, unsigned cmpPreGrpSymId, cmDspInst_t* modp, unsigned ach, unsigned mch )
|
76
|
76
|
{
|
77
|
77
|
unsigned measRtrChCnt = 6; // note: router channel 6 is not connected
|
78
|
|
-
|
|
78
|
+ unsigned scaleRangeDfltSelId = 4;
|
|
79
|
+
|
79
|
80
|
int krWndSmpCnt = 2048;
|
80
|
81
|
int krHopFact = 4;
|
81
|
82
|
|
|
@@ -103,7 +104,7 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpS
|
103
|
104
|
cmDspInst_t* cost_sr = cmDspSysAllocInst(h, "ScaleRange", NULL, 4, 0.0, 1.0, 0.001, 1.0 );
|
104
|
105
|
|
105
|
106
|
// Measurement -> parameter mappers
|
106
|
|
- cmDspInst_t* even_rt = cmDspSysAllocInst(h, "Router", lbl("even_rt"), 2, measRtrChCnt, measRtrChCnt-1 );
|
|
107
|
+ cmDspInst_t* even_rt = cmDspSysAllocInst(h, "Router", NULL, 2, measRtrChCnt, measRtrChCnt-1 );
|
107
|
108
|
cmDspInst_t* dynm_rt = cmDspSysAllocInst(h, "Router", NULL, 2, measRtrChCnt, measRtrChCnt-1 );
|
108
|
109
|
cmDspInst_t* tmpo_rt = cmDspSysAllocInst(h, "Router", NULL, 2, measRtrChCnt, measRtrChCnt-1 );
|
109
|
110
|
cmDspInst_t* cost_rt = cmDspSysAllocInst(h, "Router", NULL, 2, measRtrChCnt, measRtrChCnt-1 );
|
|
@@ -153,20 +154,20 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpS
|
153
|
154
|
// Measurement Number Controls
|
154
|
155
|
cmDspInst_t* min_dynm_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Min In Dyn"), 0.0, 10.0, 1.0, 0.0);
|
155
|
156
|
cmDspInst_t* max_dynm_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Max In Dyn"), 0.0, 10.0, 1.0, 4.0);
|
156
|
|
- cmDspInst_t* dynm_map_menu = cmDspSysAllocMsgListP(h,preGrpSymId, NULL, lbl("DynSel 0"), NULL, "measMenu", measRtrChCnt-1);
|
|
157
|
+ cmDspInst_t* dynm_map_menu = cmDspSysAllocMsgListP(h,preGrpSymId, NULL, lbl("DynSel 0"), NULL, "measMenu", scaleRangeDfltSelId);
|
157
|
158
|
|
158
|
159
|
cmDspInst_t* min_even_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Min In Even"), 0.0, 1.0, 0.001, 0.75);
|
159
|
160
|
cmDspInst_t* max_even_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Max In Even"), 0.0, 3.0, 0.001, 1.0);
|
160
|
|
- cmDspInst_t* even_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("EvenSel"), NULL, "measMenu", measRtrChCnt-1);
|
|
161
|
+ cmDspInst_t* even_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("EvenSel"), NULL, "measMenu", scaleRangeDfltSelId);
|
161
|
162
|
|
162
|
163
|
cmDspSysNewColumn(h,0);
|
163
|
164
|
cmDspInst_t* min_tmpo_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Min In Tempo"), 0.0, 200.0, 1.0, 80.0);
|
164
|
165
|
cmDspInst_t* max_tmpo_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Max In Tempo"), 0.0, 200.0, 1.0, 120.0);
|
165
|
|
- cmDspInst_t* tmpo_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("TempoSel"), NULL, "measMenu", measRtrChCnt-1);
|
|
166
|
+ cmDspInst_t* tmpo_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("TempoSel"), NULL, "measMenu", scaleRangeDfltSelId);
|
166
|
167
|
|
167
|
168
|
cmDspInst_t* min_cost_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Min In Cost"), 0.0, 1.0, 0.01, 0.0);
|
168
|
169
|
cmDspInst_t* max_cost_ctl = cmDspSysAllocScalarP( h,preGrpSymId, NULL, lbl("Max In Cost"), 0.0, 1.0, 0.01, 1.0);
|
169
|
|
- cmDspInst_t* cost_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("CostSel"), NULL, "measMenu", measRtrChCnt-1);
|
|
170
|
+ cmDspInst_t* cost_map_menu = cmDspSysAllocMsgListP( h,preGrpSymId, NULL, lbl("CostSel"), NULL, "measMenu", scaleRangeDfltSelId);
|
170
|
171
|
|
171
|
172
|
cmDspSysInstallCb(h, min_dynm_ctl, "val", dynm_sr, "min_in", NULL );
|
172
|
173
|
cmDspSysInstallCb(h, max_dynm_ctl, "val", dynm_sr, "min_in", NULL );
|