loadedmetadata -> canplay for seeking related tests

soundcloud · Nov 11, 2011 · 37d10a5 · 37d10a5
1 parent cc01f6c
commit 37d10a5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/public/tests/event-seeked.js b/public/tests/event-seeked.js
@@ -9,7 +9,7 @@
       finish(true);
     }, false);
 
-    audio.addEventListener('loadedmetadata', function() {
+    audio.addEventListener('canplay', function() {
       audio.currentTime = AWPY.sound.long.duration / 8;
     }, false);
 

diff --git a/public/tests/event-seeking.js b/public/tests/event-seeking.js
@@ -9,7 +9,7 @@
       finish(true);
     }, false);
 
-    audio.addEventListener('loadedmetadata', function() {
+    audio.addEventListener('canplay', function() {
       audio.currentTime = AWPY.sound.long.duration / 2;
     }, false);
 

diff --git a/public/tests/property-seekable.js b/public/tests/property-seekable.js
@@ -5,7 +5,7 @@
   assert: function(finish) {
     var audio = this.audio = new Audio();
 
-    audio.addEventListener('loadedmetadata', function() {
+    audio.addEventListener('canplay', function() {
       finish(audio.seekable && audio.seekable.length);
     }, false);
 

diff --git a/public/tests/property-seeking.js b/public/tests/property-seeking.js
@@ -9,7 +9,7 @@
       finish(false);
     }
 
-    audio.addEventListener('loadedmetadata', function() {
+    audio.addEventListener('canplay', function() {
       audio.currentTime = 100;
       finish(audio.seeking);
     }, false);

diff --git a/public/tests/support-seeking-unbuffered-position.js b/public/tests/support-seeking-unbuffered-position.js
@@ -8,10 +8,11 @@
         result = true;
 
     audio.addEventListener('seeked', function() {
-      if (audio.currentTime < seekedTime) {
+      if (Math.round(audio.currentTime) < seekedTime) {
         finish(false);
       }
 
+      audio.volume = 0;
       audio.play();
 
       audio.addEventListener('timeupdate', function() {
@@ -25,12 +26,11 @@
       }, false);
     }, false);
 
-    audio.addEventListener('loadedmetadata', function() {
-      audio.volume = 0;
-      audio.currentTime = seekedTime = AWPY.sound.long.duration * 0.8;
+    audio.addEventListener('canplay', function() {
+      audio.removeEventListener('canplay', arguments.callee, false);
+      audio.currentTime = seekedTime = AWPY.sound.long.duration * 0.8 | 0;
     }, false);
 
-    audio.preload = 'metadata';
     audio.src = AWPY.sound.long.stream_url();
   }
 })