Ticket #2434: mythplayback.diff

libs/libmythtv/NuppelVideoPlayer.h

@@ -521 +521 @@
     QWaitCondition decoderThreadPaused;
     QWaitCondition videoThreadPaused;
     QMutex   vidExitLock;
+    QMutex   pauseLock;
+    bool     pause_signal;
     bool     eof;             ///< At end of file/ringbuffer
     bool     m_double_framerate;///< Output fps is double Video (input) rate
     bool     m_can_double;    ///< VideoOutput capable of doubling frame rate

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -150 +150 @@
       eof(false),                   m_double_framerate(false),
       m_can_double(false),          paused(false),
       pausevideo(false),            actuallypaused(false),
+      pause_signal(false),
       video_actually_paused(false), playing(false),
       decoder_thread_alive(true),   killplayer(false),
       killvideo(false),             livetv(false),
@@ -451 +452 @@
 
 void NuppelVideoPlayer::PauseVideo(bool wait)
 {
+    pauseLock.lock();
     video_actually_paused = false;
     pausevideo = true;
 
     if (wait && !video_actually_paused)
     {
-        while (!videoThreadPaused.wait(1000))
+        while (!pause_signal && !videoThreadPaused.wait(&pauseLock, 1000))
         {
             if (eof)
+            {
+                pause_signal=false;
+                pauseLock.unlock();
                 return;
+            }
             VERBOSE(VB_IMPORTANT, "Waited too long for video out to pause");
         }
     }
+    pause_signal=false;
+    pauseLock.unlock();
 }
 
 void NuppelVideoPlayer::UnpauseVideo(void)
 {
+    pauseLock.lock();
     pausevideo = false;
+    pause_signal=true;
+    pauseLock.unlock();
+    videoThreadPaused.wakeAll();
 }
 
 void NuppelVideoPlayer::SetPrebuffering(bool prebuffer)