소스 검색

cmDspPgmKr.c : Added connection from 'simulate' check button to routers

and added siRt to route midi file player smpidx output in
'simulate' mode.
master
kevin 11 년 전
부모
커밋
2855506568
1개의 변경된 파일18개의 추가작업 그리고 9개의 파일을 삭제
  1. 18
    9
      dsp/cmDspPgmKr.c

+ 18
- 9
dsp/cmDspPgmKr.c 파일 보기

@@ -205,6 +205,7 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
205 205
   cmDspInst_t* au0Sw = cmDspSysAllocInst(h,"1ofN",   NULL, 2, 2, 0);
206 206
   cmDspInst_t* au1Sw = cmDspSysAllocInst(h,"1ofN",   NULL, 2, 2, 0);
207 207
 
208
+  cmDspInst_t* siRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);  
208 209
   cmDspInst_t* d0Rt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
209 210
   cmDspInst_t* d1Rt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
210 211
   cmDspInst_t* stRt  = cmDspSysAllocInst(h,"Router", NULL, 2, 2, 0);
@@ -364,14 +365,14 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
364 365
   cmDspSysConnectAudio(h, wtp,  "out",   au0Sw, "a-in-0" ); // wt  -> sw
365 366
   cmDspSysConnectAudio(h, ai0p, "out",   au0Sw, "a-in-1" ); // ain -> sw
366 367
   cmDspSysConnectAudio(h, au0Sw,"a-out", kr00, "in"  );     // sw  -> kr
367
-  cmDspSysConnectAudio(h, kr00, "out",   fad0, "in-0");  
368
-  cmDspSysConnectAudio(h, fad0, "out-0", mix0, "in-0");
368
+  cmDspSysConnectAudio(h, kr00, "out",   fad0, "in-0");     // kr  -> fad
369
+  cmDspSysConnectAudio(h, fad0, "out-0", mix0, "in-0");     // fad -> mix
369 370
 
370
-  cmDspSysConnectAudio(h, au0Sw,"a-out", kr01, "in"  );  
371
-  cmDspSysConnectAudio(h, kr01, "out",   fad0, "in-1");  
372
-  cmDspSysConnectAudio(h, fad0, "out-1", mix0, "in-1");
373
-  cmDspSysConnectAudio(h, mix0, "out",   cmp0, "in");
374
-  cmDspSysConnectAudio(h, cmp0, "out",   ao0p, "in" );   // comp -> aout
371
+  cmDspSysConnectAudio(h, au0Sw,"a-out", kr01, "in"  );     // sw  -> kr
372
+  cmDspSysConnectAudio(h, kr01, "out",   fad0, "in-1");     // kr  -> fad
373
+  cmDspSysConnectAudio(h, fad0, "out-1", mix0, "in-1");     // fad -> mix
374
+  cmDspSysConnectAudio(h, mix0, "out",   cmp0, "in");       // mix -> cmp
375
+  cmDspSysConnectAudio(h, cmp0, "out",   ao0p, "in" );      // cmp -> aout
375 376
 
376 377
 
377 378
   cmDspSysConnectAudio(h, wtp,  "out",   au1Sw, "a-in-0" );  // wt -> kr
@@ -400,10 +401,15 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
400 401
   cmDspSysInstallCb(h, liveb, "out",  amRt, "sel", NULL );
401 402
   cmDspSysInstallCb(h, liveb, "out",  au0Sw, "chidx", NULL );
402 403
   cmDspSysInstallCb(h, liveb, "out",  au1Sw, "chidx", NULL );
404
+
405
+  // 'simulate' button -> simulate router selector switch
403 406
   cmDspSysInstallCb(h, simb,  "out",  au0Sw, "chidx", NULL );
404 407
   cmDspSysInstallCb(h, simb,  "out",  au1Sw, "chidx", NULL );
408
+  cmDspSysInstallCb(h, simb,  "out",  siRt,  "sel", NULL );
409
+  cmDspSysInstallCb(h, simb,  "out",  d1Rt,  "sel", NULL );
410
+  cmDspSysInstallCb(h, simb,  "out",  d0Rt,  "sel", NULL );
411
+  cmDspSysInstallCb(h, simb,  "out",  stRt,  "sel", NULL );
405 412
   
406
-
407 413
   
408 414
   // start connections
409 415
   cmDspSysInstallCb(h, onb,  "sym",    tlRt, "s-in",  NULL );
@@ -446,7 +452,10 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
446 452
 
447 453
 
448 454
   // MIDI file player to score follower
449
-  cmDspSysInstallCb(h, mfp,  "smpidx",  sfp,  "smpidx",NULL );
455
+  cmDspSysInstallCb(h, mfp,  "smpidx",  siRt, "f-in",NULL );
456
+  cmDspSysInstallCb(h, siRt, "f-out-0", sfp,  "smpidx",NULL ); 
457
+  // leave siRt.f-out-1 unconnected because it should be ignored in 'simulate mode'
458
+
450 459
   cmDspSysInstallCb(h, mfp,  "d1",      d1Rt, "f-in",  NULL );
451 460
   cmDspSysInstallCb(h, d1Rt, "f-out-0", sfp,  "d1",    NULL );
452 461
   cmDspSysInstallCb(h, d1Rt, "f-out-1", mop,  "d1",    NULL );

Loading…
취소
저장