Merge pull request #510 from bbc/add-disable-sentinels-option

Fix bugs introduced in 8.2.0
bbc · Jun 19, 2018 · 63b55cf · 63b55cf
2 parents b1c88f5 + 179e641
commit 63b55cf
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/static/script-tests/tests/devices/mediaplayer/live/playable.js b/static/script-tests/tests/devices/mediaplayer/live/playable.js
@@ -45,7 +45,7 @@
 
     this.LivePlayerSupportLevelPlayableTest.prototype.testLivePlayerBeginPlaybackCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('beginPlayback', 0);
 
-    this.LivePlayerSupportLevelPlayableTest.prototype.testLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 3);
+    this.LivePlayerSupportLevelPlayableTest.prototype.testLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 4);
 
     this.LivePlayerSupportLevelPlayableTest.prototype.testLivePlayerStopCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('stop', 0);
 

diff --git a/static/script-tests/tests/devices/mediaplayer/live/restartable.js b/static/script-tests/tests/devices/mediaplayer/live/restartable.js
@@ -52,7 +52,7 @@
 
     this.LivePlayerSupportLevelRestartableTest.prototype.testLivePlayerBeginPlaybackFromCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('beginPlaybackFrom', 1);
 
-    this.LivePlayerSupportLevelRestartableTest.prototype.testLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 3);
+    this.LivePlayerSupportLevelRestartableTest.prototype.testLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 4);
 
     this.LivePlayerSupportLevelRestartableTest.prototype.testLivePlayerStopCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('stop', 0);
 

diff --git a/static/script-tests/tests/devices/mediaplayer/live/seekable.js b/static/script-tests/tests/devices/mediaplayer/live/seekable.js
@@ -83,7 +83,7 @@
         };
     };
 
-    this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 3);
+    this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 4);
 
     this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerBeginPlaybackCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('beginPlayback', 0);
 

diff --git a/static/script/devices/mediaplayer/live/playable.js b/static/script/devices/mediaplayer/live/playable.js
@@ -38,14 +38,14 @@ define(
                 this._mediaPlayer.beginPlayback();
             },
 
-            setSource: function setSource (mediaType, sourceUrl, mimeType) {
+            setSource: function setSource (mediaType, sourceUrl, mimeType, opts) {
                 if (mediaType === MediaPlayer.TYPE.AUDIO) {
                     mediaType = MediaPlayer.TYPE.LIVE_AUDIO;
                 } else {
                     mediaType = MediaPlayer.TYPE.LIVE_VIDEO;
                 }
 
-                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType);
+                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType, opts);
             },
 
             stop: function stop () {

diff --git a/static/script/devices/mediaplayer/live/restartable.js b/static/script/devices/mediaplayer/live/restartable.js
@@ -55,14 +55,14 @@ define(
                 this._determineTimeSpentBuffering();
             },
 
-            setSource: function setSource (mediaType, sourceUrl, mimeType) {
+            setSource: function setSource (mediaType, sourceUrl, mimeType, opts) {
                 if (mediaType === MediaPlayer.TYPE.AUDIO) {
                     mediaType = MediaPlayer.TYPE.LIVE_AUDIO;
                 } else {
                     mediaType = MediaPlayer.TYPE.LIVE_VIDEO;
                 }
 
-                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType);
+                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType, opts);
             },
 
             pause: function pause (opts) {

diff --git a/static/script/devices/mediaplayer/live/seekable.js b/static/script/devices/mediaplayer/live/seekable.js
@@ -30,14 +30,14 @@ define(
                 this._mediaPlayer = RuntimeContext.getDevice().getMediaPlayer();
             },
 
-            setSource: function setSource (mediaType, sourceUrl, mimeType) {
+            setSource: function setSource (mediaType, sourceUrl, mimeType, opts) {
                 if (mediaType === MediaPlayer.TYPE.AUDIO) {
                     mediaType = MediaPlayer.TYPE.LIVE_AUDIO;
                 } else {
                     mediaType = MediaPlayer.TYPE.LIVE_VIDEO;
                 }
 
-                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType);
+                this._mediaPlayer.setSource(mediaType, sourceUrl, mimeType, opts);
             },
 
             beginPlayback: function beginPlayback () {

diff --git a/static/script/devices/mediaplayer/seekfinishedemitevent.js b/static/script/devices/mediaplayer/seekfinishedemitevent.js
@@ -19,7 +19,7 @@ define(
 
         return function (OverrideClass) {
             var oldSetSource = OverrideClass.prototype.setSource;
-            OverrideClass.prototype.setSource = function (mediaType, url, mimeType) {
+            OverrideClass.prototype.setSource = function (mediaType, url, mimeType, opts) {
                 this._count = 0;
                 if (this.getState() === MediaPlayer.STATE.EMPTY) {
                     this._emitEvent(MediaPlayer.EVENT.SEEK_ATTEMPTED);
@@ -37,7 +37,7 @@ define(
                 } else {
                     this._timeoutHappened = true;
                 }
-                oldSetSource.call(this, mediaType, url, mimeType);
+                oldSetSource.call(this, mediaType, url, mimeType, opts);
             };
 
             var oldOnStatus = OverrideClass.prototype._onStatus;
-Original file line number
+Diff line change
@@ Expand Up / @@ -83,7 +83,7 @@ @@
             };
         };
-        this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 3);
+        this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerSetSourceCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('setSource', 4);
         this.LivePlayerSupportLevelSeekableTest.prototype.testSeekableLivePlayerBeginPlaybackCallsFunctionInMediaPlayer = testFunctionsInLivePlayerCallMediaPlayerFunctions('beginPlayback', 0);
@@ Expand Down @@