Ensure paused state is retained after seeking or changing video settings

Author: pannal

lib/player.py

@@ -271,6 +271,9 @@ def seek(self, offset, settings_changed=False, seeking=SEEK_IN_PROGRESS):
 
         self.seeking = self.SEEK_IN_PROGRESS
 
+        if self.player.playState == self.player.STATE_PAUSED:
+            self.player.pauseAfterPlaybackStarted = True
+
         util.DEBUG_LOG('New player offset: {0}'.format(self.offset))
         self.player._playVideo(offset, seeking=self.seeking, force_update=settings_changed)
 
@@ -286,7 +289,6 @@ def rewind(self):
     def seekAbsolute(self, seek=None):
         self.seekOnStart = seek or self.seekOnStart
         if self.seekOnStart is not None:
-            self.player.control('play')
             seekSeconds = self.seekOnStart / 1000.0
             try:
                 if seekSeconds >= self.player.getTotalTime():
@@ -624,6 +626,7 @@ def init(self):
         self._closed = False
         self._nextItem = None
         self.started = False
+        self.pauseAfterPlaybackStarted = False
         self.video = None
         self.hasOSD = False
         self.hasSeekOSD = False
@@ -648,11 +651,13 @@ def reset(self):
         self.video = None
         self.started = False
         self.playerObject = None
+        self.pauseAfterPlaybackStarted = False
         self.handler = AudioPlayerHandler(self)
         self.currentTime = 0
 
     def control(self, cmd):
         if cmd == 'play':
+            self.pauseAfterPlaybackStarted = False
             util.DEBUG_LOG('Player - Control:  Command=Play')
             if xbmc.getCondVisibility('Player.Paused | !Player.Playing'):
                 util.DEBUG_LOG('Player - Control:  Playing')
@@ -874,6 +879,10 @@ def onPrePlayStarted(self):
 
     def onPlayBackStarted(self):
         self.started = True
+        if self.pauseAfterPlaybackStarted:
+            self.control('pause')
+            self.pauseAfterPlaybackStarted = False
+
         util.DEBUG_LOG('Player - STARTED')
         self.trigger('playback.started')
         if not self.handler:
@@ -890,6 +899,7 @@ def onPlayBackResumed(self):
         util.DEBUG_LOG('Player - RESUMED')
         if not self.handler:
             return
+
         self.handler.onPlayBackResumed()
 
     def onPlayBackStopped(self):

lib/windows/seekdialog.py

@@ -654,13 +654,9 @@ def doSeek(self, offset=None, settings_changed=False):
         self._applyingSeek = True
         self.resetSkipSteps()
         self.updateProgress()
-        state_before_seek = self.player.playState
 
         try:
             self.handler.seek(self.selectedOffset if offset is None else offset, settings_changed=settings_changed)
-
-            if state_before_seek == self.player.STATE_PAUSED:
-                self.player.control("pause")
         finally:
             self._seeking = False
             self._seekingWithoutOSD = False