Browse Source

cmDspPgmKr.c : Added audio output 2&3 to handle direct through dry signal.

master
kevin 11 years ago
parent
commit
c442830e85
1 changed files with 11 additions and 1 deletions
  1. 11
    1
      dsp/cmDspPgmKr.c

+ 11
- 1
dsp/cmDspPgmKr.c View File

@@ -398,7 +398,7 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
398 398
   cmDspInst_t* amp  = cmDspSysAllocInst(h,"ActiveMeas",  NULL,  1, 100 );
399 399
   cmDspInst_t* rpp  = cmDspSysAllocInst(h,"RecdPlay",    NULL,  6, 2, r.scFn, recdPlayInitAllocSecs, recdPlayMaxLaSecs, recdPlayCurLaSecs, recdPlayFadeRateDbPerSec );
400 400
   cmDspInst_t* modp = cmDspSysAllocInst(h,"ScMod",       NULL,  2, r.modFn, "m1" );
401
-
401
+ 
402 402
   unsigned   preGrpSymId     = cmDspSysPresetRegisterGroup(h,"tl");
403 403
   unsigned   cmpPreGrpSymId  = cmDspSysPresetRegisterGroup(h,"tl_cmp"); 
404 404
 
@@ -414,6 +414,9 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
414 414
   cmDspInst_t* mix1 = cmDspSysAllocInst(h,"AMix",        NULL,   3, 2, 1.0, 1.0 );
415 415
   cmDspInst_t* ao1p = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 1 );
416 416
 
417
+  cmDspInst_t* ao2p = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 2 );
418
+  cmDspInst_t* ao3p = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, 3 );
419
+
417 420
   cmDspSysNewPage(h,"Main");
418 421
   cmDspInst_t* liveb= cmDspSysAllocInst(h,"Button", "live",    2, kCheckDuiId,  0.0 );
419 422
   cmDspInst_t* simb = cmDspSysAllocInst(h,"Button", "simulate",2, kCheckDuiId,  0.0 );
@@ -451,6 +454,8 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
451 454
   cmDspInst_t* dbpsec = cmDspSysAllocInst(h,"Scalar", "Fade dBpSec",  5, kNumberDuiId, 0.0,   24.0, 0.01, recdPlayFadeRateDbPerSec);
452 455
   cmDspInst_t* ogain0 = cmDspSysAllocInst(h,"Scalar", "Out Gain-0",   5, kNumberDuiId, 0.0,   10.0,0.01,   3.0 );  
453 456
   cmDspInst_t* ogain1 = cmDspSysAllocInst(h,"Scalar", "Out Gain-1",   5, kNumberDuiId, 0.0,   10.0,0.01,   3.0 );  
457
+  cmDspInst_t* ogain2 = cmDspSysAllocInst(h,"Scalar", "Out Gain-2",   5, kNumberDuiId, 0.0,   10.0,0.01,   3.0 );  
458
+  cmDspInst_t* ogain3 = cmDspSysAllocInst(h,"Scalar", "Out Gain-3",   5, kNumberDuiId, 0.0,   10.0,0.01,   3.0 );  
454 459
 
455 460
   // Audio file recording
456 461
   cmDspInst_t* recdGain= cmDspSysAllocInst(h,"Scalar", "Recd Gain",  5, kNumberDuiId, 0.0,   100.0,0.01, 1.5 );  
@@ -499,6 +504,9 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
499 504
   cmDspSysConnectAudio(h, c0.cmp, "out", afop, "in0" );    // comp -> audio_file_out
500 505
   cmDspSysConnectAudio(h, c1.cmp, "out", afop, "in1" );
501 506
 
507
+  cmDspSysConnectAudio(h, ai0p, "out", ao2p, "in" );
508
+  cmDspSysConnectAudio(h, ai1p, "out", ao3p, "in" );
509
+
502 510
 
503 511
   //--------------- Preset controls
504 512
   cmDspSysNewColumn(h,0);
@@ -662,6 +670,8 @@ cmDspRC_t _cmDspSysPgm_TimeLine(cmDspSysH_t h, void** userPtrPtr )
662 670
   cmDspSysInstallCb(h, igain1, "val", ai1p, "gain", NULL );
663 671
   cmDspSysInstallCb(h, ogain0, "val", ao0p, "gain", NULL );   // output gain control
664 672
   cmDspSysInstallCb(h, ogain1, "val", ao1p, "gain", NULL );
673
+  cmDspSysInstallCb(h, ogain2, "val", ao2p, "gain", NULL );
674
+  cmDspSysInstallCb(h, ogain3, "val", ao3p, "gain", NULL );
665 675
 
666 676
   return rc;
667 677
 }

Loading…
Cancel
Save