Ticket #1261: mythtv_startup2.patch

libs/libmythtv/NuppelVideoPlayer.h

@@ -569 +573 @@
     bool       m_playing_slower;
     bool       decode_extra_audio;
     float      m_stored_audio_stretchfactor;
+    bool       audio_paused;
 
     // Audio warping stuff
     bool       usevideotimebase;

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -159 +160 @@
       avsync_oldavg(0),             refreshrate(0),
       lastsync(false),              m_playing_slower(false),
       m_stored_audio_stretchfactor(1.0),
+      audio_paused(false),
       // Audio warping stuff
       usevideotimebase(false), 
       warpfactor(1.0f),             warpfactor_avg(1.0f),
@@ -282 +284 @@
     //cout << "stopping other threads" << endl;
     PauseVideo(waitvideo);
     if (audioOutput)
+    {
+        audio_paused = true;
         audioOutput->Pause(true);
+    }
     if (ringBuffer)
         ringBuffer->Pause();
 
@@ -304 +309 @@
 
     UnpauseVideo();
     if (audioOutput && unpauseaudio)
-        audioOutput->Pause(false);
+        audio_paused = false;
     if (ringBuffer)
         ringBuffer->Unpause();
 
@@ -352 +358 @@
     {
         prebuffering = prebuffer;
         if (audioOutput && !paused)
-            audioOutput->Pause(prebuffering);
+        {
+            if (prebuffering)
+                audioOutput->Pause(prebuffering);
+            audio_paused = prebuffering;
+        }
     }
 
     if (!prebuffering)
@@ -1929 +1960 @@
     videoOutput->ProcessFrame(frame, osd, videoFilters, pipplayer);
     videofiltersLock.unlock();
 
+    if (audioOutput && !audio_paused && audioOutput->GetPause())
+        audioOutput->Pause(false);
+
     AVSync();
 
     videoOutput->DoneDisplayingFrame();
@@ -2361 +2397 @@
     }
 
     if (audioOutput)
+    {
+        audio_paused = true;
+        audioOutput->Pause(true);   // always start audio off as paused
         audioOutput->SetStretchFactor(audio_stretchfactor);
+    }
     next_play_speed = audio_stretchfactor;
 
     if (!InitVideo())