Implement get/setVolume methods

README.md

@@ -46,9 +46,11 @@ All controls return `this`. If provided an audio element as the source, one can
 
 * `play()` plays the audio and begins the dance.
 * `pause()` pauses the madness.
+* `setVolume()` sets the player's current volume.
 
 ### Getters
 
+* `getVolume()` returns a normalized value (0 to 1) of the current volume.
 * `getTime()` returns the current time.
 * `getProgress()` returns the downloading progress as a float from 0 to 1.
 * `getWaveform()` returns the waveform data array (Float32Array(1024))

spec/dancer.js

@@ -75,6 +75,17 @@ describe('Dancer', function () {
       expect(playReturn).toBe(dancer);
       expect(pauseReturn).toBe(dancer);
     });
+
+    it("The volume should default to 1", function () {
+      expect(dancer.getVolume()).toEqual(1);
+    });
+    it("Should change the volume with setVolume() and return `this`", function () {
+      expect(dancer.setVolume(0.5)).toBe(dancer);
+      expect(dancer.getVolume()).toBeWithin(0.5, 0.0001);
+      dancer.setVolume(0.1);
+      expect(dancer.getVolume()).toBeWithin(0.1, 0.0001);
+      dancer.setVolume(1);
+    });
   });
 
   describe('createBeat()', function () {

src/adapterFlash.js

@@ -66,10 +66,18 @@
       this.isPlaying = false;
     },
 
+    setVolume : function ( volume ) {
+      this.audio.setVolume( volume * 100 );
+    },
+
     _updateProgress : function ( _this ) {
       _this.progress = this.bytesLoaded / this.bytesTotal;
     },
 
+    getVolume : function () {
+      return this.audio.volume / 100;
+    },
+
     getProgress : function () {
       return this.progress;
     },

src/adapterMoz.js

@@ -43,12 +43,20 @@
       this.isPlaying = false;
     },
 
+    setVolume : function ( volume ) {
+      this.audio.volume = volume;
+    },
+
     _updateProgress : function ( e ) {
       if ( e.currentTarget.duration ) {
         this.progress = e.currentTarget.seekable.end( 0 ) / e.currentTarget.duration;
       }
     },
 
+    getVolume : function () {
+      return this.audio.volume;
+    },
+
     getProgress : function () {
       return this.progress;
     },

src/adapterWebkit.js

@@ -24,6 +24,7 @@
       this.proc.onaudioprocess = function ( e ) {
         _this.update.call( _this, e );
       };
+      this.gain = this.context.createGainNode();
 
       this.fft = new FFT( SAMPLE_SIZE / 2, SAMPLE_RATE );
       this.signal = new Float32Array( SAMPLE_SIZE / 2 );
@@ -53,12 +54,20 @@
       this.isPlaying = false;
     },
 
+    setVolume : function ( volume ) {
+      this.gain.gain.value = volume;
+    },
+
     _updateProgress : function ( e ) {
       if ( e.currentTarget.duration ) {
         this.progress = e.currentTarget.seekable.end( 0 ) / e.currentTarget.duration;
       }
     },
 
+    getVolume : function () {
+      return this.gain.gain.value;
+    },
+
     getProgress : function() {
       return this.progress;
     },
@@ -105,7 +114,8 @@
   function connectContext () {
     this.source = this.context.createMediaElementSource( this.audio );
     this.source.connect( this.proc );
-    this.source.connect( this.context.destination );
+    this.source.connect( this.gain );
+    this.gain.connect( this.context.destination );
     this.proc.connect( this.context.destination );
 
     this.isLoaded = true;

src/dancer.js

@@ -51,6 +51,11 @@
       return this;
     },
 
+    setVolume : function ( volume ) {
+      this.audioAdapter.setVolume( volume );
+      return this;
+    },
+
 
     /* Actions */
 
@@ -86,6 +91,10 @@
 
     /* Getters */
 
+    getVolume : function () {
+      return this.audioAdapter.getVolume();
+    },
+
     getProgress : function () {
       return this.audioAdapter.getProgress();
     },