Added volume and muted support.

[sound.git] / sound.js

diff --git a/sound.js b/sound.js
index f823be31f00e5338f75967e0ec7c3564ac09c844..843be80670bcda818c25042a1b75f0dad78e527e 100644 (file)
--- a/sound.js
+++ b/sound.js
@@ -129,8 +129,9 @@ Sound.prototype = {
                if (this._ended && this._playbackRate > 0)
                        this.setCurrentTime(0);
 
                if (this._ended && this._playbackRate > 0)
                        this.setCurrentTime(0);
 

-               if (this._paused) {
+               if (this._paused || this._ended) {

                        this._paused = false;
                        this._paused = false;

+                       this._ended = false;

                        this.dispatchEventAsync(new CustomEvent('play'));
 
                        if (this._readyState < this.READY.FUTURE_DATA)
                        this.dispatchEventAsync(new CustomEvent('play'));
 
                        if (this._readyState < this.READY.FUTURE_DATA)


@@ -162,7 +163,7 @@ Sound.prototype = {
                this._autoplay = false;
 
                if (!this._paused) {
                this._autoplay = false;
 
                if (!this._paused) {

-                       this._paused = false;
+                       this._paused = true;

                        this.dispatchEventAsync(new CustomEvent('timeupdate'));
                        this.dispatchEventAsync(new CustomEvent('pause'));
                }
                        this.dispatchEventAsync(new CustomEvent('timeupdate'));
                        this.dispatchEventAsync(new CustomEvent('pause'));
                }


@@ -319,12 +320,29 @@ Sound.prototype = {
        },
 
        setVolume: function(volume) {
        },
 
        setVolume: function(volume) {

+               if (this._volume == volume)
+                       return;
+

                this._volume = volume;
                this._volume = volume;

-               if (!this.gainNode)
+               this.dispatchEventAsync(new CustomEvent('volumechange'));
+
+               if (this.gainNode)
+                       this.gainNode.gain.value = this._muted ? 0 : this._volume;
+       },
+
+       getMuted: function() {
+               return this._muted;
+       },
+
+       setMuted: function(muted) {
+               if (this._muted == muted)

                        return;
 
                        return;
 

-               this.gainNode.gain.value = volume;
+               this._muted = muted;

                this.dispatchEventAsync(new CustomEvent('volumechange'));
                this.dispatchEventAsync(new CustomEvent('volumechange'));

+
+               if (this.gainNode)
+                       this.gainNode.gain.value = this._muted ? 0 : this._volume;

        },
 };
 
        },
 };