Restructure SoundEffect classes a little

Author: grumdrig

index.html

@@ -50,7 +50,7 @@
   setTimeout(function () { 
     var audio = new Audio();
     if (!noregen) {
-      SOUND = new SoundEffectByUI(PARAMS).generate();
+      SOUND = new SoundEffect(PARAMS).generate();
       $("#file_size").text(Math.round(SOUND.wav.length / 1024) + "kB");
       $("#num_samples").text(SOUND.header.subChunk2Size / 
                              (SOUND.header.bitsPerSample >> 3));

sfxr.js

@@ -639,8 +639,15 @@ Params.prototype.tone = function () {
 
 
 
-function SoundEffectByUI(ps) {
+function SoundEffect(ps) {
+  if (ps.oldParams)
+    this.initFromUI(ps);
+  else
+    this.init(ps);
+}
 
+
+SoundEffect.prototype.initFromUI = function (ps) {
   //
   // Convert user-facing parameter values to units usable by the sound
   // generator
@@ -716,8 +723,7 @@ function SoundEffectByUI(ps) {
 
 
 
-function SoundEffect(ps) {
-
+SoundEffect.prototype.init = function (ps) {
   //
   // Convert user-facing parameter values to units usable by the sound
   // generator
@@ -781,8 +787,7 @@ function SoundEffect(ps) {
 }
 
 
-SoundEffectByUI.prototype.generate =
-    SoundEffect.prototype.generate = function () {
+SoundEffect.prototype.generate = function () {
   var fltp = 0;
   var fltdp = 0;
   var fltphp = 0;
@@ -1010,7 +1015,6 @@ if (typeof exports !== 'undefined')  {
   exports.Params = Params;
   exports.Knobs = Knobs;
   exports.SoundEffect = SoundEffect;
-  exports.SoundEffectByUI = SoundEffectByUI;
   exports.SQUARE = SQUARE;
   exports.SAWTOOTH = SAWTOOTH;
   exports.SINE = SINE;

test.js

@@ -31,7 +31,7 @@ function diff(a, b, title) {
 }
 
 
-//var sound = new sfxr.SoundEffectByUI((new sfxr.Params()).tone()).generate();
+//var sound = new sfxr.SoundEffect((new sfxr.Params()).tone()).generate();
 /*
 var knobs = new sfxr.Knobs({
   shape: sfxr.SAWTOOTH,
@@ -53,7 +53,7 @@ console.log("\nKNOBS FOR IT\n");
 dump(new sfxr.Knobs().tone());
 
 console.log("\nPARAMS TONE\n")
-dump(b = new sfxr.SoundEffectByUI(new sfxr.Params().tone()));
+dump(b = new sfxr.SoundEffect(new sfxr.Params().tone()));
 
 console.log("\nPARAMS FOR IT\n")
 dump(new sfxr.Params().tone());
@@ -70,7 +70,7 @@ require("fs").writeFile("./test.wav", new Buffer(sound.wav), 'binary',
                           if(err) {
                             sys.puts(err);
                           } else {
-                            sys.puts("The file was saved!");
+                            sys.puts("test.wav saved!");
                           }
                         });