fix .out in SynthStream SynthEventList and AudioBus

crucialfelix · Apr 25, 2016 · 8e051c0 · 8e051c0
1 parent 0009107
commit 8e051c0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src/dryads/AudioBus.js b/src/dryads/AudioBus.js
@@ -2,7 +2,8 @@
 import {Dryad} from 'dryadic';
 
 /**
-  * Allocates an audio bus, making it available in the children's context as .bus (integer)
+  * Allocates an audio bus, making it available in the children's context as .out (integer)
+  * and .numChannels (integer)
   */
 export default class AudioBus extends Dryad {
 
@@ -22,14 +23,14 @@ export default class AudioBus extends Dryad {
 
   prepareForAdd() {
     return {
-      bus: (context) => context.scserver.state.allocAudioBus(this.properties.numChannels),
+      out: (context) => context.scserver.state.allocAudioBus(this.properties.numChannels),
       numChannels: this.properties.numChannels
     };
   }
 
   remove() {
     return {
-      run: (context) => context.scserver.state.freeAudioBus(context.bus, this.properties.numChannels)
+      run: (context) => context.scserver.state.freeAudioBus(context.out, this.properties.numChannels)
     };
   }
 }
diff --git a/src/dryads/SCServer.js b/src/dryads/SCServer.js
@@ -23,13 +23,19 @@ export default class SCServer extends Dryad {
     };
   }
 
-  prepareForAdd() {
+  initialContext() {
     return {
-      scserver: (context) => boot(_.defaults(this.properties.options, {log: context.log})),
+      out: 0,
       group: 0
     };
   }
 
+  prepareForAdd() {
+    return {
+      scserver: (context) => boot(_.defaults(this.properties.options, {log: context.log}))
+    };
+  }
+
   remove() {
     return {
       run: (context) => {

diff --git a/src/dryads/SynthEventList.js b/src/dryads/SynthEventList.js
@@ -84,8 +84,7 @@ export default class SynthEventList extends Dryad {
     const defaultParams = this.properties.defaultParams || {};
     return events.map((event) => {
       const defName = event.defName || defaultParams.defName;
-      const args = _.assign({}, defaultParams.args, event.args);
-      args.out = context.out || 0;
+      const args = _.assign({out: context.out || 0}, defaultParams.args, event.args);
       const msg = synthNew(defName, -1, AddActions.TAIL, context.group, args);
       // epoch: takes a Date or date.getTime()
       // find first defined

diff --git a/src/dryads/SynthStream.js b/src/dryads/SynthStream.js
@@ -34,9 +34,7 @@ export default class SynthStream extends Dryad {
           // Should validate that event.value is object
           let ev = event.value();
           let defaultParams = this.properties.defaultParams || {};
-          // should update 'out' with the bus if there is an out
-          // arg on the def
-          const args = _.assign({}, defaultParams.args, ev.args);
+          const args = _.assign({out: context.out || 0}, defaultParams.args, ev.args);
           const defName = ev.defName || this.properties.defaultParams.defName;
           const synth = synthNew(defName, -1, AddActions.TAIL, context.group, args);
           player.callCommand(context.id, {