Changing oscillator.type to use string instead of integer - fixes #25.

meenie · Jul 22, 2014 · c9e932c · c9e932c
1 parent 781af90
commit c9e932c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/instrument-packs/oscillators.js b/src/instrument-packs/oscillators.js
@@ -16,14 +16,9 @@ module.exports = OscillatorInstrumentPack;
  * @constructor
  */
 function OscillatorInstrumentPack(name, audioContext) {
-    var types = {
-        sine: 0,
-        square: 1,
-        sawtooth: 2,
-        triangle: 3
-    };
+    var types = ['sine', 'square', 'sawtooth', 'triangle'];
 
-    if (typeof types[name] === 'undefined') {
+    if (types.indexOf(name) === -1) {
         throw new Error(name + ' is not a valid Oscillator type');
     }
 
@@ -34,7 +29,7 @@ function OscillatorInstrumentPack(name, audioContext) {
             // Connect note to volume
             o.connect(destination);
             // Set pitch type
-            o.type = types[name];
+            o.type = name;
             // Set frequency
             o.frequency.value = frequency;
 

diff --git a/test/conductor-test.js b/test/conductor-test.js
@@ -1,4 +1,3 @@
-var Conductor = require('../src/conductor');
 describe('Conductor Class', function() {
     var Conductor = require('../src/conductor');