Fix pause/play; tag 0.9.5

bvibber · Aug 3, 2015 · 0d8c3c3 · 0d8c3c3
1 parent 8ca6a50
commit 0d8c3c3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION:=0.9.4
+VERSION:=0.9.5
 BUILDDATE:=$(shell date -u "+%Y%m%d%H%M%S")
 HASH:=$(shell git rev-parse --short HEAD)
 FULLVER:=$(VERSION)-$(BUILDDATE)-$(HASH)

diff --git a/readme.md b/readme.md
@@ -7,6 +7,8 @@ Based around libogg, libvorbis, libtheora, libopus, libvpx, and libnestegg compi
 
 ## Updates
 
+* 0.9.5
+ * fix pause/play regression
 * 0.9.4
  * fix regressions
 * 0.9.3

diff --git a/src/OGVPlayer.js b/src/OGVPlayer.js
@@ -188,13 +188,15 @@ OGVPlayer = window.OGVPlayer = function(options) {
 		if (offset !== undefined) {
 			initialPlaybackOffset = offset;
 		}
+		log('continuing at ' + initialPlaybackPosition + ', ' + initialPlaybackOffset);
 	}
 
 	function stopPlayback() {
 		if (audioFeeder) {
 			audioFeeder.stop();
 		}
 		initialPlaybackOffset = getPlaybackTime();
+		log('pausing at ' + initialPlaybackOffset);
 	}
 
 	/**
@@ -1109,14 +1111,14 @@ OGVPlayer = window.OGVPlayer = function(options) {
 		if (paused) {
 			startedPlaybackInDocument = document.body.contains(self);
 			paused = false;
+			actionQueue.push(function() {
+				startPlayback();
+				fireEvent('play');
+				pingProcessing(0);
+			});
 			if (continueVideo) {
 				continueVideo();
 			} else {
-				actionQueue.push(function() {
-					startPlayback();
-					fireEvent('play');
-					pingProcessing(0);
-				});
 				continueVideo = function() {
 					if (isProcessing()) {
 						// waiting on the codec already