]> id.pley.net Git - sound.git/commitdiff
git://id.pley.net / sound.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: cdba288)
Add rate changed events; add a rate slider; parse incoming floats to ensure valid...
authorJer Noble <jer.noble@apple.com>
Tue, 27 Jan 2015 17:17:36 +0000 (18:17 +0100)
committerJer Noble <jer.noble@apple.com>
Tue, 27 Jan 2015 17:17:36 +0000 (18:17 +0100)
sound.html patch | blob | history
sound.js patch | blob | history

diff --git a/sound.html b/sound.html
index 3982cee93b37ada4da86dfe0edd5a4e6291d7d9a..af49cce23d2ec94c98e80b68649fa287f81f4cfb 100644 (file)
--- a/sound.html
+++ b/sound.html
@@ -46,6 +46,8 @@
                audio.addEventListener('timeupdate', updateTime);
                audio.addEventListener('durationchange', eventLogger);
                audio.addEventListener('durationchange', updateDuration);
                audio.addEventListener('timeupdate', updateTime);
                audio.addEventListener('durationchange', eventLogger);
                audio.addEventListener('durationchange', updateDuration);
+               audio.addEventListener('ratechange', eventLogger);
+               audio.addEventListener('ratechange', updateRate);
        }
 
        function formatTime(time) {
        }
 
        function formatTime(time) {
@@ -56,10 +58,11 @@
 
        function updateTime() {
                var time = document.getElementById('time');
 
        function updateTime() {
                var time = document.getElementById('time');
-               time.innerText = formatTime(audio.currentTime);
+               var currentTime = audio.currentTime;
+               time.innerText = formatTime(currentTime);
 
                var timeline = document.getElementById('timeline');
 
                var timeline = document.getElementById('timeline');
-               timeline.value = audio.currentTime;
+               timeline.value = currentTime;
        }
 
        function updateDuration() {
        }
 
        function updateDuration() {
@@ -70,6 +73,11 @@
                timeline.max = audio.duration;
        }
 
                timeline.max = audio.duration;
        }
 
+       function updateRate() {
+               var rate = document.getElementById('rate');
+               rate.value = audio.playbackRate;
+       }
+
        </script>
 </head>
 <body onload="onload()">
        </script>
 </head>
 <body onload="onload()">
@@ -80,15 +88,16 @@
                </select>
        </div>
        <div>
                </select>
        </div>
        <div>
-               <input type="range" min="0" max="1" step="0.01" value="1" onchange="audio.volume = event.target.value" />
+               <input type="range" min="0" max="1" step="0.01" value="1" oninput="audio.volume = event.target.value" />
                <button onclick="audio.play()">play</button>
                <button onclick="audio.pause()">pause</button>
                <button onclick="audio.muted = !audio.muted">mute</button>
                <span id="time">--:--</span>
                <button onclick="audio.play()">play</button>
                <button onclick="audio.pause()">pause</button>
                <button onclick="audio.muted = !audio.muted">mute</button>
                <span id="time">--:--</span>
-               <input id="timeline" type="range" min="0" max="1" step="0.01" value="0" onchange="audio.currentTime = event.target.value" />
+               <input id="timeline" type="range" min="0" max="1" step="0.01" value="0" oninput="audio.currentTime = event.target.value" />
                <span id="duration">--:--</span>
                <button onclick="audio.loop = !audio.loop">loop</button>
                <button onclick="audio.playbackRate = -audio.playbackRate">reverse</button>
                <span id="duration">--:--</span>
                <button onclick="audio.loop = !audio.loop">loop</button>
                <button onclick="audio.playbackRate = -audio.playbackRate">reverse</button>
+               <input id="rate" type="range" min="-1" max="1" step="0.01" value="1" oninput="audio.playbackRate = event.target.value" />
        </div>
 
 </body>
        </div>
 
 </body>
diff --git a/sound.js b/sound.js
index 355cfd4dd8b863bf6c14c1f9be85be315ed1a133..8fcac31691dd2ad8bc57ef8eced6900e9cd5eaba 100644 (file)
--- a/sound.js
+++ b/sound.js
@@ -240,7 +240,7 @@ Sound.prototype = {
             return;
 
         if (this._ended) {
             return;
 
         if (this._ended) {
-            if this._playbackRate > 0)
+            if (this._playbackRate > 0)
                 this.setCurrentTime(0);
             else
                 this.setCurrentTime(this.duration)
                 this.setCurrentTime(0);
             else
                 this.setCurrentTime(this.duration)
@@ -469,7 +469,7 @@ Sound.prototype = {
     },
 
     setCurrentTime: function(time) {
     },
 
     setCurrentTime: function(time) {
-        this.nextStartTime = time;
+        this.nextStartTime = parseFloat(time);
         this.dispatchEventAsync(new CustomEvent('timeupdate'));
         if (!this.node)
             return;
         this.dispatchEventAsync(new CustomEvent('timeupdate'));
         if (!this.node)
             return;
@@ -495,12 +495,12 @@ Sound.prototype = {
 
     setPlaybackRate: function(rate) {
         var oldPlaybackRate = this._playbackRate;
 
     setPlaybackRate: function(rate) {
         var oldPlaybackRate = this._playbackRate;
-        this._playbackRate = rate;
+        this._playbackRate = parseFloat(rate);
+        this.dispatchEventAsync(new CustomEvent('ratechange'));
 
 
-        if (this.buffer) {
+        if (this.node) {
             this.nextStartTime = oldPlaybackRate * (Sound.audioContext.currentTime - this.startTime);
             this.nextStartTime = oldPlaybackRate * (Sound.audioContext.currentTime - this.startTime);
-            this.stopInternal();
-            this.playInternal();
+            this.node.playbackRate.value = this._playbackRate;
         }
     },
 
         }
     },
 
@@ -509,7 +509,8 @@ Sound.prototype = {
     },
 
     setDefaultPlaybackRate: function(rate) {
     },
 
     setDefaultPlaybackRate: function(rate) {
-        this._defaultPlaybackRate = rate;
+        this._defaultPlaybackRate = parseFloat(rate);
+        this.dispatchEventAsync(new CustomEvent('ratechange'));
     },
 
     getVolume: function() {
     },
 
     getVolume: function() {
@@ -520,7 +521,7 @@ Sound.prototype = {
         if (this._volume === volume)
             return;
 
         if (this._volume === volume)
             return;
 
-        this._volume = volume;
+        this._volume = parseFloat(volume);
         this.dispatchEventAsync(new CustomEvent('volumechange'));
 
         if (this.gainNode)
         this.dispatchEventAsync(new CustomEvent('volumechange'));
 
         if (this.gainNode)