Merge branch 'master' into remove-nodejs-support

* master:
  Fixes gh-252: Regularizes synth evaluation. Removes pseudo-modelism. Removes remaining uses of .input(); renames Synth.gen to generate.
  gh-252: Updates tests for synth restructuring and removal of input(). Renames Synth.genFn to generate().
  gh-252: Moves synth-related grades into separate files.

Gruntfile.js

@@ -40,10 +40,7 @@ module.exports = function(grunt) {
             "src/core.js",
             "src/node-list.js",
             "src/evaluators.js",
-            "src/synths/model.js",
-            "src/synths/group.js",
-            "src/synths/polyphonic.js",
-            "src/synths/band.js",
+            "src/synths/*.js",
             "src/buffers.js",
             "src/parser.js",
             "src/audiofile.js",

demos/audio-file/index.html

@@ -17,6 +17,7 @@
 
         <script src="../../src/core.js"></script>
         <script src="../../src/node-list.js"></script>
+        <script src="../../src/synths/synth.js"></script>
         <script src="../../src/evaluators.js"></script>
         <script src="../../src/scheduler.js"></script>
         <script src="../../src/buffers.js"></script>
@@ -117,7 +118,7 @@ <h1>Audio File Decoding Demo</h1>
 
             // Dynamically change the playback speed of the playBuffer ugen based on changes to the slider.
             document.querySelector("#playbackSpeed").addEventListener("change", function (e) {
-                synth.input("player.speed", Number(e.target.value));
+                synth.set("player.speed", Number(e.target.value));
                 e.preventDefault();
                 e.stopPropagation();
             }, false);

demos/audio-input/index.html

@@ -24,6 +24,7 @@
         <script src="../../src/core.js"></script>
         <script src="../../src/node-list.js"></script>
         <script src="../../src/evaluators.js"></script>
+        <script src="../../src/synths/synth.js"></script>
         <script src="../../src/scheduler.js"></script>
         <script src="../../src/buffers.js"></script>
         <script src="../../src/audiofile.js"></script>

demos/media-element-input/index.html

@@ -30,6 +30,7 @@
         <script src="../../src/core.js"></script>
         <script src="../../src/node-list.js"></script>
         <script src="../../src/evaluators.js"></script>
+        <script src="../../src/synths/synth.js"></script>
         <script src="../../src/synths/band.js"></script>
         <script src="../../src/scheduler.js"></script>
         <script src="../../src/buffers.js"></script>

demos/midi/receive/index.html

@@ -36,6 +36,7 @@
         <script src="../../../src/core.js"></script>
         <script src="../../../src/node-list.js"></script>
         <script src="../../../src/evaluators.js"></script>
+        <script src="../../../src/synths/synth.js"></script>
         <script src="../../../src/synths/model.js"></script>
         <script src="../../../src/synths/group.js"></script>
         <script src="../../../src/synths/polyphonic.js"></script>

demos/playground/demos/multiple-synths.js

@@ -32,5 +32,5 @@ var fundamental = 440,
 clock.repeat(1, function () {
     var intervalSynth = flock.choose(synths),
         newInterval = flock.choose(weightedIntervals);
-    intervalSynth.input("carrier.freq", fundamental * newInterval);
+    intervalSynth.set("carrier.freq", fundamental * newInterval);
 });

demos/playground/index.html

@@ -52,6 +52,8 @@
         <script src="../../src/core.js"></script>
         <script src="../../src/node-list.js"></script>
         <script src="../../src/evaluators.js"></script>
+        <script src="../../src/synths/synth.js"></script>
+        <script src="../../src/synths/value.js"></script>
         <script src="../../src/synths/model.js"></script>
         <script src="../../src/synths/group.js"></script>
         <script src="../../src/synths/polyphonic.js"></script>

demos/playground/live/index.html

@@ -57,6 +57,8 @@
         <script src="../../../src/core.js"></script>
         <script src="../../../src/node-list.js"></script>
         <script src="../../../src/evaluators.js"></script>
+        <script src="../../../src/synths/synth.js"></script>
+        <script src="../../../src/synths/value.js"></script>
         <script src="../../../src/synths/model.js"></script>
         <script src="../../../src/synths/group.js"></script>
         <script src="../../../src/synths/polyphonic.js"></script>

demos/shared/js/demo-utils.js

@@ -11,45 +11,45 @@ var fluid = fluid || require("infusion"),
     demo = fluid.registerNamespace("demo");
 
 (function () {
-    
+
     "use strict";
-    
+
     demo.toggleButtonView = function(synth, options) {
         var that = {
             model: {
                 isPlaying: false
             },
-            
+
             synth: synth,
             button: document.querySelector(typeof (options) === "string" ? options : options.selectors.button),
             onPlay: options.onPlay,
             onPause: options.onPause
         };
         that.buttonBaseClass = that.button.className; // TODO: ummm... library, anyone?
-        
+
         that.play = function () {
             if (that.onPlay) {
                 that.onPlay(that.button);
             }
-            
+
             that.button.innerHTML = "Pause";
             that.button.className = that.buttonBaseClass + " " + "playing";
             that.synth.play();
             that.model.isPlaying = true;
         };
-        
+
         that.pause = function () {
             if (that.onPause) {
                 that.onPause(that.button);
             }
-            
+
             that.button.innerHTML = "Play";
             that.button.className = that.buttonBaseClass + " " + "paused";
             that.synth.pause();
 
             that.model.isPlaying = false;
         };
-        
+
         // Wire it up to a button on the page.
         that.button.addEventListener("click", function () {
             if (!that.model.isPlaying) {
@@ -58,29 +58,29 @@ var fluid = fluid || require("infusion"),
                 that.pause();
             }
         }, false);
-        
+
         that.pause();
         return that;
     };
-    
+
     demo.fileSelectorView = function(synth, options) {
         var that = {
             input: document.querySelector(options.selectors.input),
             button: document.querySelector(options.selectors.button),
             fileName: document.querySelector(options.selectors.fileName)
         };
-        
+
         that.input.addEventListener("change", function () {
             if (that.fileName) {
                 that.fileName.innerHTML = that.input.files[0].name;
             }
-            
+
             var players = fluid.makeArray(options.playerId);
             fluid.each(players, function (id) {
-                synth.input(id).onInputChanged("buffer");
+                synth.get(id).onInputChanged("buffer");
             });
         });
-		
+
         // On Firefox, bind a click event to the browse button, which delegates to the hidden (ugly) file input element.
         if (window.navigator.userAgent.indexOf("Firefox") !== -1) {
             that.button.addEventListener("click", function (e) {
@@ -96,24 +96,24 @@ var fluid = fluid || require("infusion"),
             }
         }
     };
-    
+
     demo.dataUrlSelectorView = function (synth, options) {
         var that = {
             field: document.querySelector(options.selectors.field)
         };
-        
+
         that.field.addEventListener("change", function () {
             that.dataUrl = that.field.value;
-            
+
             var players = fluid.makeArray(options.playerId);
             fluid.each(players, function (id) {
-                var player = synth.input(id),
-                    bufDef = player.input("buffer");
-            
+                var player = synth.get(id),
+                    bufDef = player.get("buffer");
+
                 bufDef.url = that.dataUrl;
                 player.onInputChanged("buffer");
             });
         });
     };
-    
-})();
+
+})();