]> 105106.c2e0p.group Git - sound.git/commitdiff
git://105106.c2e0p.group / sound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 1c34429)
Added volume and muted support.
authorJer Noble <[email protected]>
Thu, 20 Feb 2014 19:39:50 +0000 (11:39 -0800)
committerJer Noble <[email protected]>
Thu, 20 Feb 2014 19:39:50 +0000 (11:39 -0800)
sound.html patch | blob | history
sound.js patch | blob | history

diff --git a/sound.html b/sound.html
index 34889fa9696ccb6fd0bdfcaecc61a1ded261fd1b..82020e64951cdcd44f8099f5e293ac026bc12aab 100644 (file)
--- a/sound.html
+++ b/sound.html
@@ -4,15 +4,52 @@
        <title>sound test</title>
        <script src="sound.js"></script>
        <script>
        <title>sound test</title>
        <script src="sound.js"></script>
        <script>
-       var sound = new Sound();
-       sound.src = 'Coin.wav';
-       sound.play();
-       sound.addEventListener('ended', function() { document.body.appendChild(document.createTextNode('ended')); })
+
+       var sound;
+
+       function log(text) {
+               var log = document.getElementById('log');
+               if (!log) {
+                       log = document.createElement('div');
+                       log.id = 'log';
+                       document.body.appendChild(log);
+               }
+
+               var line = document.createElement('div');
+               line.appendChild(document.createTextNode(text));
+               log.insertBefore(line, log.firstChild);
+       }
+
+       function eventLogger(event) {
+               log(event.type);
+       }
+
+       function onload() {
+               sound = new Sound();
+               sound.src = 'Coin.wav';
+               sound.play();
+               sound.addEventListener('ended', eventLogger);
+               sound.addEventListener('play', eventLogger);
+               sound.addEventListener('pause', eventLogger);
+               sound.addEventListener('playing', eventLogger);
+               sound.addEventListener('timeupdate', eventLogger);
+               sound.addEventListener('waiting', eventLogger);
+               sound.addEventListener('volumechange', eventLogger);
+               sound.addEventListener('emptied', eventLogger);
+               sound.addEventListener('loadstart', eventLogger);
+               sound.addEventListener('progress', eventLogger);
+       }
+
        </script>
 </head>
        </script>
 </head>
-<body>
+<body onload="onload()">
 
 
-<button onclick="sound.play()">play</button><button onclick="sound.pause()">pause</button>
+       <div>
+               <button onclick="sound.play()">play</button>
+               <button onclick="sound.pause()">pause</button>
+               <button onclick="sound.muted = !sound.muted">mute</button>
+               <input type="range" min="0" max="1" step="0.01" onchange="sound.volume = event.target.value" />
+       </div>
 
 </body>
 </html>
\ No newline at end of file
 
 </body>
 </html>
\ No newline at end of file
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;
        },
 };
 
        },
 };