Fix scheduleWhilePaused not working (#3785)

* Fix scheduleWhilePaused not working
Dash-Industry-Forum · Oct 12, 2021 · c1f889d · c1f889d
1 parent ea3d3b9
commit c1f889d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/streaming/controllers/ScheduleController.js b/src/streaming/controllers/ScheduleController.js
@@ -192,7 +192,8 @@ function ScheduleController(config) {
      */
     function _shouldClearScheduleTimer() {
         try {
-            return (((type === Constants.TEXT) && !textController.isTextEnabled()));
+            return (((type === Constants.TEXT) && !textController.isTextEnabled()) ||
+                    (playbackController.isPaused() && (!playbackController.getStreamController().getInitialPlayback() || !playbackController.getStreamController().getAutoPlay()) && !settings.get().streaming.scheduling.scheduleWhilePaused));
         } catch (e) {
             return false;
         }

diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -752,11 +752,14 @@ function StreamController() {
      * @private
      */
     function _onPlaybackStarted( /*e*/) {
-        logger.debug('[onPlaybackStarted]');
-        if (!initialPlayback && isPaused) {
-            isPaused = false;
+        logger.debug('[onPlaybackStarted]');        
+        if (!initialPlayback && isPaused) {            
             createPlaylistMetrics(PlayList.RESUME_FROM_PAUSE_START_REASON);
         }
+        if (initialPlayback) {
+            initialPlayback = false;
+        }
+        isPaused = false;
     }
 
     /**
@@ -984,6 +987,22 @@ function StreamController() {
         return activeStream;
     }
 
+    /**
+     * Initial playback indicates if we have called play() for the first time yet.
+     * @return {*}
+     */
+    function getInitialPlayback() {
+        return initialPlayback;
+    }
+
+    /**
+     * Auto Play indicates if the stream starts automatically as soon as it is initialized.
+     * @return {boolean}
+     */
+    function getAutoPlay() {
+        return autoPlay;
+    }
+
     /**
      * Called once the first stream has been initialized. We only use this function to seek to the right start time.
      * @return {number}
@@ -1504,6 +1523,8 @@ function StreamController() {
         getHasMediaOrInitialisationError,
         getStreams,
         getActiveStream,
+        getInitialPlayback,
+        getAutoPlay,
         reset
     };