Browse Source

cmDspPgmKrTimeLineLite.c : Initial changes to support Spirio.

master
kevin 3 years ago
parent
commit
99c7c96c3d
1 changed files with 30 additions and 11 deletions
  1. 30
    11
      src/dsp/cmDspPgmKrTimeLineLite.c

+ 30
- 11
src/dsp/cmDspPgmKrTimeLineLite.c View File

@@ -75,11 +75,15 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
75 75
 
76 76
   cmDspInst_t* mfp  = cmDspSysAllocInst(h,"MidiFilePlay",NULL,  0 );
77 77
   cmDspInst_t* nmp  = cmDspSysAllocInst(h,"NanoMap",     NULL,  0 );
78
-  cmDspInst_t* pic  = cmDspSysAllocInst(h,"Picadae",     NULL,  0 );
79
-  //cmDspInst_t* mop  = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "Scarlett 18i20 USB","Scarlett 18i20 USB MIDI 1");
78
+  cmDspInst_t* mdly_st = cmDspSysAllocInst(h,"MsgDelay",    NULL,  2, 1024, 500.0 );
79
+  cmDspInst_t* mdly_d0 = cmDspSysAllocInst(h,"MsgDelay",    NULL,  2, 1024, 500.0 );
80
+  cmDspInst_t* mdly_d1 = cmDspSysAllocInst(h,"MsgDelay",    NULL,  2, 1024, 500.0 );
81
+  
82
+  //cmDspInst_t* pic  = cmDspSysAllocInst(h,"Picadae",     NULL,  0 );
80 83
   cmDspInst_t* mop  = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "Fastlane","Fastlane MIDI A" );
81 84
   //cmDspInst_t* mo2p = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "picadae","picadae MIDI 1");
82
-  cmDspInst_t* mo2p = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "Fastlane","Fastlane MIDI B");
85
+  cmDspInst_t* mo2p  = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "Scarlett 18i20 USB","Scarlett 18i20 USB MIDI 1");
86
+  //cmDspInst_t* mo2p = cmDspSysAllocInst(h,"MidiOut",     NULL,  2, "Fastlane","Fastlane MIDI A");
83 87
   cmDspInst_t* sfp  = cmDspSysAllocInst(h,"ScFol",       NULL,  5, r.scFn, sfBufCnt, sfMaxWndCnt, sfMinVel, sfEnaMeasFl );
84 88
   cmDspInst_t* amp  = cmDspSysAllocInst(h,"ActiveMeas",  NULL,  1, 100 );
85 89
   cmDspInst_t* modp = cmDspSysAllocInst(h,"ScMod",       NULL,  2, r.modFn, "m1" );
@@ -102,7 +106,7 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
102 106
   cmDspInst_t* ao3 = cmDspSysAllocInst(h,"AudioOut",    NULL,   1, baseAudioOutCh+1 ); // 3          2
103 107
 
104 108
   cmDspSysNewPage(h,"Main");
105
-  cmDspInst_t* notesOffb= cmDspSysAllocInst(h,"Button", "notesOff",   2, kButtonDuiId, 1.0 );
109
+  //cmDspInst_t* notesOffb= cmDspSysAllocInst(h,"Button", "notesOff",   2, kButtonDuiId, 1.0 );
106 110
   cmDspInst_t* onb     = cmDspSysAllocInst(h,"Button", "start",   2, kButtonDuiId, 1.0 );
107 111
   cmDspInst_t* offb    = cmDspSysAllocInst(h,"Button", "stop",    2, kButtonDuiId, 1.0 );
108 112
   cmDspInst_t* mod_sel = cmDspSysAllocMsgList(h, NULL, "mod_sel", 1 );
@@ -135,6 +139,11 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
135 139
   cmDspInst_t* mi0p    = cmDspSysAllocInst(h,"AMeter","In 0",  0);
136 140
   cmDspInst_t* mi1p    = cmDspSysAllocInst(h,"AMeter","In 1",  0);
137 141
 
142
+  cmDspInst_t* msgDly    = cmDspSysAllocInst(h,"Scalar", "Delay", 5, kNumberDuiId, 1.0,   1000.0,1.0,   500.0 );  
143
+  cmDspSysInstallCb( h, msgDly, "val", mdly_st, "delay", NULL);
144
+  cmDspSysInstallCb( h, msgDly, "val", mdly_d0, "delay", NULL);
145
+  cmDspSysInstallCb( h, msgDly, "val", mdly_d1, "delay", NULL);
146
+ 
138 147
   cmDspInst_t* meas    = cmDspSysAllocInst(h,"Scalar", "Meas",    5, kNumberDuiId, 1.0,   59.0,1.0,   1.0 );  
139 148
   cmDspSysInstallCb( h, meas, "val", scp, "meas", NULL);
140 149
   cmDspSysInstallCb( h, meas, "val", tlp, "meas", NULL);
@@ -241,7 +250,7 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
241 250
 
242 251
   cmDspSysInstallCb(h, prePath, "out", tlp, "path", NULL );
243 252
 
244
-  cmDspSysInstallCb(h, notesOffb,  "sym",    pic, "alloff",  NULL );
253
+  //cmDspSysInstallCb(h, notesOffb,  "sym",    pic, "alloff",  NULL );
245 254
   
246 255
   // start connections
247 256
   cmDspSysInstallCb(h, onb,  "sym",    tlRt, "s-in",  NULL );
@@ -265,6 +274,9 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
265 274
   cmDspSysInstallCb(h, pts,  "off", modp,"cmd",   NULL );
266 275
   cmDspSysInstallCb(h, offb, "sym", mop, "reset", NULL );
267 276
   cmDspSysInstallCb(h, offb, "sym", mo2p,"reset", NULL );
277
+  cmDspSysInstallCb(h, offb, "sym", mdly_st,"clear", NULL );
278
+  cmDspSysInstallCb(h, offb, "sym", mdly_d0,"clear", NULL );
279
+  cmDspSysInstallCb(h, offb, "sym", mdly_d1,"clear", NULL );
268 280
 
269 281
 
270 282
   // time-line to MIDI file player selection
@@ -286,20 +298,27 @@ cmDspRC_t _cmDspSysPgm_TimeLineLite(cmDspSysH_t h, void** userPtrPtr )
286 298
   cmDspSysInstallCb(h, msrc,   "d1",     sfp,  "d1",    NULL );
287 299
   cmDspSysInstallCb(h, msrc,   "d1",     nmp,  "d1",    NULL );
288 300
   cmDspSysInstallCb(h, nmp,   "d1",     mop,  "d1",    NULL );
289
-  cmDspSysInstallCb(h, nmp,   "d1",     pic, "d1",    NULL );
290
-  cmDspSysInstallCb(h, pic,   "d1",     mo2p, "d1",    NULL );
301
+  //cmDspSysInstallCb(h, nmp,   "d1",     mdly_d1, "in",    NULL );  
302
+  //cmDspSysInstallCb(h, mdly_d1, "out",  mo2p, "d1",    NULL );
303
+  //cmDspSysInstallCb(h, pic,   "d1",     mo2p, "d1",    NULL );
304
+  cmDspSysInstallCb(h, nmp, "d1",  mo2p, "d1",    NULL );
291 305
 
292 306
   cmDspSysInstallCb(h, msrc,  "d0",      sfp,  "d0",   NULL );
293 307
   cmDspSysInstallCb(h, msrc,  "d0",      nmp,  "d0",   NULL );
294 308
   cmDspSysInstallCb(h, nmp,  "d0",      mop,  "d0",   NULL );
295
-  cmDspSysInstallCb(h, nmp,  "d0",      pic, "d0",   NULL );
296
-  cmDspSysInstallCb(h, pic,   "d0",     mo2p, "d0",    NULL );
309
+  //cmDspSysInstallCb(h, nmp,   "d0",     mdly_d0, "in",    NULL );  
310
+  //cmDspSysInstallCb(h, mdly_d0, "out",  mo2p, "d0",    NULL );
311
+  //cmDspSysInstallCb(h, pic,   "d0",     mo2p, "d0",    NULL );
312
+  cmDspSysInstallCb(h, nmp, "d0",  mo2p, "d0",    NULL );
297 313
 
298 314
   cmDspSysInstallCb(h, msrc,  "status",  sfp,  "status",NULL );
299 315
   cmDspSysInstallCb(h, msrc,  "status",  nmp,  "status",NULL );
300 316
   cmDspSysInstallCb(h, nmp,  "status",  mop,  "status",NULL );
301
-  cmDspSysInstallCb(h, nmp,  "status",  pic, "status",NULL );
302
-  cmDspSysInstallCb(h, pic,   "status",  mo2p, "status",    NULL );
317
+  //cmDspSysInstallCb(h, nmp,   "status", mdly_st, "in",    NULL );  
318
+  //cmDspSysInstallCb(h, mdly_st, "out",  mo2p, "status",    NULL );
319
+  cmDspSysInstallCb(h, nmp, "status",  mo2p, "status",    NULL );
320
+  
321
+  //cmDspSysInstallCb(h, pic,   "status",  mo2p, "status",    NULL );
303 322
 
304 323
 
305 324
   // score follower to recd_play,modulator and printers

Loading…
Cancel
Save