diff --git a/dsp/cmDspPgmKrChain.c b/dsp/cmDspPgmKrChain.c index 18eeeaf..ec558ce 100644 --- a/dsp/cmDspPgmKrChain.c +++ b/dsp/cmDspPgmKrChain.c @@ -36,6 +36,9 @@ #include "cmDspPgmKrChain.h" +#undef KR2 + + cmDspRC_t krLoadRsrc(cmDspSysH_t h, cmErr_t* err, krRsrc_t* r) { cmDspRC_t rc; @@ -71,7 +74,7 @@ const cmChar_t* _mlbl(const cmChar_t* prefix, unsigned ch ) #define mlbl(a) _mlbl(a,mch) #define lbl(a) cmDspSysPrintLabel(a,ach) - +#ifndef KR2 void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpSymId, unsigned cmpPreGrpSymId, cmDspInst_t* modp, unsigned ach, unsigned mch ) { unsigned measRtrChCnt = 6; // note: router channel 6 is not connected @@ -357,4 +360,186 @@ void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpS c->cmp = cmp; } +#endif +//======================================================================================================================= +//======================================================================================================================= +// KR2 Modeless Transform based on cmDspKr2 and cmSpecDist2 +//======================================================================================================================= +//======================================================================================================================= + +#ifdef KR2 +void _cmDspSys_TlXformChain( cmDspSysH_t h, cmDspTlXform_t* c, unsigned preGrpSymId, unsigned cmpPreGrpSymId, cmDspInst_t* modp, unsigned ach, unsigned mch ) +{ + unsigned measRtrChCnt = 6; // note: router channel 6 is not connected + + 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* ceil_rt = cmDspSysAllocInst(h, "Router", NULL, 2, paramRtChCnt, paramRtChCnt-1 ); + cmDspInst_t* expo_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 ); + + + // Parameter number controls + 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* ceil_ctl= cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Ceiling"), 0.0, 100.0, 0.1, 30.0 ); + cmDspInst_t* expo_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, 0.1, 60.0 ); + cmDspInst_t* upr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Upr slope"), -10.0, 10.0, 0.01, 0.0 ); + cmDspInst_t* lwr_ctl = cmDspSysAllocScalarP( h,preGrpSymId,NULL, lbl("Lwr slope"), -10.0, 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, ceil_ctl, "val", ceil_rt, "f-in", NULL ); + cmDspSysInstallCb(h, achan, "ch", ceil_rt, "sel", NULL ); // ach->rt sel + cmDspSysInstallCb(h, ceil_rt, "f-out-0", kr0, "ceil", NULL ); // ceil->kr + cmDspSysInstallCb(h, ceil_rt, "f-out-1", kr1, "ceil", NULL ); // ceil->kr + + cmDspSysInstallCb(h, expo_ctl, "val", expo_rt, "f-in", NULL ); + cmDspSysInstallCb(h, achan, "ch", expo_rt, "sel", NULL ); // ach->rt sel + cmDspSysInstallCb(h, expo_rt, "f-out-0", kr0, "expo", NULL ); // expo->kr + cmDspSysInstallCb(h, expo_rt, "f-out-1", kr1, "expo", NULL ); // expo->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 + + + 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 + + + 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); + + cmDspSysInstallCb(h, modp, mlbl("win"), wnd_ctl, "sel", NULL ); + cmDspSysInstallCb(h, modp, mlbl("hop"), hop_ctl, "sel", NULL ); + cmDspSysInstallCb(h, modp, mlbl("ceil"), ceil_ctl, "val", NULL ); + cmDspSysInstallCb(h, modp, mlbl("expo"), expo_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; + +} + +#endif