Ticket #9665: fixes_0_24_pause.diff

mythtv/libs/libmythtv/mythplayer.h

@@ -173 +173 @@
     PIPLocation GetNextPIPLocation(void) const;
 
     // Bool Gets
+    bool    IsPaused(void)                    { return allpaused;      }
     bool    GetRawAudioState(void) const;
     bool    GetLimitKeyRepeat(void) const     { return limitKeyRepeat; }
     bool    GetEof(void);

mythtv/libs/libmythtv/playercontext.cpp

@@ -42 +42 @@
     // Fast forward state
     ff_rew_state(0), ff_rew_index(0), ff_rew_speed(0),
     // Other state
-    paused(false), playingState(kState_None),
+    playingState(kState_None),
     errored(false),
     // pseudo states
     pseudoLiveTVRec(NULL), pseudoLiveTVState(kPseudoNormalLiveTV),

mythtv/libs/libmythtv/playercontext.h

@@ -184 +184 @@
     int                 ff_rew_index;
     /// Caches value of ff_rew_speeds[ff_rew_index]
     int                 ff_rew_speed;
-    bool                paused;
     TVState             playingState;
 
     bool                errored;

mythtv/libs/libmythtv/tv_play.cpp

@@ -1178 +1178 @@
     }
 
     PlayerContext *mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
-    mctx->paused = false;
     mctx->ff_rew_state = 0;
     mctx->ff_rew_index = kInitFFRWSpeed;
     mctx->ff_rew_speed = 0;
@@ -3111 +3110 @@
 void TV::HandleIsNearEndWhenEmbeddingTimerEvent(void)
 {
     PlayerContext *actx = GetPlayerReadLock(-1, __FILE__, __LINE__);
-
-    bool toggle = !actx->paused && !StateIsLiveTV(GetState(actx));
-
-    if (toggle)
+    if (!StateIsLiveTV(GetState(actx)))
     {
         actx->LockDeletePlayer(__FILE__, __LINE__);
-
-        toggle = actx->player && actx->player->IsEmbedding()
-                           && actx->player->IsNearEnd();
-
+        bool toggle = actx->player && actx->player->IsEmbedding() &&
+                      actx->player->IsNearEnd() && !actx->player->IsPaused();
         actx->UnlockDeletePlayer(__FILE__, __LINE__);
-
         if (toggle)
             DoTogglePause(actx, true);
     }
@@ -3155 +3148 @@
             jumped_back = false;
 
         do_prompt = mctx->player->IsNearEnd() && !jumped_back &&
-            !mctx->player->IsEmbedding() && !mctx->paused;
+            !mctx->player->IsEmbedding() && !mctx->player->IsPaused();
     }
     mctx->UnlockDeletePlayer(__FILE__, __LINE__);
 
@@ -3921 +3914 @@
         DoPlay(ctx);
     else if (has_action("PAUSE", actions))
     {
-        if (ctx->paused)
+        if (ContextIsPaused(ctx, __FILE__, __LINE__))
             SendMythSystemPlayEvent("PLAY_UNPAUSED", ctx->playingInfo);
         else
             SendMythSystemPlayEvent("PLAY_PAUSED", ctx->playingInfo);
@@ -4482 +4475 @@
     }
     else if (tokens.size() == 3 && tokens[1] == "SPEED")
     {
+        bool paused = ContextIsPaused(ctx, __FILE__, __LINE__);
+
         if (tokens[2] == "0x")
         {
             NormalSpeed(ctx);
             StopFFRew(ctx);
-
-            if (!ctx->paused)
+            if (!paused)
                 DoTogglePause(ctx, true);
         }
         else
@@ -4529 +4523 @@
                 float searchSpeed = fabs(tmpSpeed);
                 unsigned int index;
 
-                if (ctx->paused)
+                if (paused)
                     DoTogglePause(ctx, true);
 
                 if (tmpSpeed == 0.0f)
@@ -4537 +4531 @@
                     NormalSpeed(ctx);
                     StopFFRew(ctx);
 
-                    if (!ctx->paused)
+                    if (!paused)
                         DoTogglePause(ctx, true);
                 }
                 else if (tmpSpeed == 1.0f)
@@ -4675 +4669 @@
         if (tokens[2] == "POSITION")
         {
             QString speedStr;
-
-            if (ctx->paused)
+            if (ContextIsPaused(ctx, __FILE__, __LINE__))
             {
                 speedStr = "pause";
             }
@@ -5522 +5515 @@
         ctx->player->Play(ctx->ts_normal, true);
         ctx->ff_rew_speed = 0;
     }
-    else if (ctx->paused || (ctx->ff_rew_speed != 0))
+    else if (ctx->player->IsPaused() || (ctx->ff_rew_speed != 0))
     {
         ctx->player->Play(ctx->ts_normal, true);
-        ctx->paused = false;
         ctx->ff_rew_speed = 0;
     }
     ctx->UnlockDeletePlayer(__FILE__, __LINE__);
@@ -5555 +5547 @@
         ctx->UnlockDeletePlayer(__FILE__, __LINE__);
         return 0.0f;
     }
-    if (ctx->paused)
+    if (ctx->player->IsPaused())
     {
         ctx->player->Play(ctx->ts_normal, true);
     }
@@ -5571 +5563 @@
         ctx->player->Pause();
     }
     ctx->UnlockDeletePlayer(__FILE__, __LINE__);
-
-    ctx->paused = !ctx->paused;
-
     return time;
 }
 
@@ -5585 +5574 @@
     if (ctx->buffer && ctx->buffer->InDVDMenuOrStillFrame())
         return;
 
-    if (ctx->paused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
     {
         if (ctx->buffer)
             ctx->buffer->WaitForPause();
@@ -5689 +5678 @@
     {
         DoArbSeek(actx, static_cast<ArbSeekWhence>(flags & kWhenceMask));
     }
-    else if (actx->paused)
+    else if (ContextIsPaused(actx, __FILE__, __LINE__))
     {
         if (!isDVD)
         {
@@ -5791 +5780 @@
 {
     int old_speed = ctx->ff_rew_speed;
 
-    if (ctx->paused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
         ctx->ff_rew_speed = -4;
 
     ctx->ff_rew_speed += direction;
@@ -5827 +5816 @@
         return;
     }
     ctx->UnlockDeletePlayer(__FILE__, __LINE__);
-
-    ctx->paused = false;
     DoPlayerSeek(ctx, time);
     UpdateOSDSeekMessage(ctx, mesg, kOSDTimeout_Med);
 
@@ -5888 +5875 @@
     else
     {
         NormalSpeed(ctx);
-        ctx->paused = false;
         ctx->ff_rew_state = direction;
         SetFFRew(ctx, kInitFFRWSpeed);
     }
@@ -6447 +6433 @@
         return;
     }
 
-    // If Nuppel Video Player is paused, unpause it
-    if (ctx->paused)
+    // If MythPlayer is paused, unpause it
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
     {
         HideOSDWindow(ctx, "osd_status");
         GetMythUI()->DisableScreensaver();
-        ctx->paused = false;
     }
 
     const QString curinputname = ctx->recorder->GetInput();
@@ -6777 +6762 @@
 
     QString oldinputname = ctx->recorder->GetInput();
 
-    if (ctx->paused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
     {
         HideOSDWindow(ctx, "osd_status");
         GetMythUI()->DisableScreensaver();
-        ctx->paused = false;
     }
 
     // Save the current channel if this is the first time
@@ -6890 +6874 @@
     if (getit || !ctx->recorder || !ctx->recorder->CheckChannel(channum))
         return;
 
-    if (ctx->paused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
     {
         HideOSDWindow(ctx, "osd_status");
         GetMythUI()->DisableScreensaver();
-        ctx->paused = false;
     }
 
     // Save the current channel if this is the first time
@@ -7019 +7002 @@
 /** \fn TV::ToggleOSD(const PlayerContext*, bool includeStatus)
  *  \brief Cycle through the available Info OSDs.
  */
-void TV::ToggleOSD(const PlayerContext *ctx, bool includeStatusOSD)
+void TV::ToggleOSD(PlayerContext *ctx, bool includeStatusOSD)
 {
     OSD *osd = GetOSDLock(ctx);
     bool hideAll    = false;
     bool showStatus = false;
-    if (ctx->paused || !osd)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__) || !osd)
     {
         ReturnOSDLock(ctx, osd);
         return;
@@ -7660 +7643 @@
     vector<float> times;
     for (uint i = 0; lctx && i < player.size() && i < pause.size(); i++)
     {
-        was_paused.push_back(GetPlayer(lctx,i)->paused);
+        PlayerContext *actx = GetPlayer(lctx, i);
+        if (actx)
+            was_paused.push_back(ContextIsPaused(actx, __FILE__, __LINE__));
         float time = 0.0f;
         if (pause[i] ^ was_paused.back())
             time = DoTogglePauseStart(GetPlayer(lctx,i));
@@ -7711 +7696 @@
     bool isNearEnd = false;
     bool isLiveTV = StateIsLiveTV(GetState(actx));
     bool allowEmbedding = false;
+    bool paused = false;
 
     {
         actx->LockDeletePlayer(__FILE__, __LINE__);
-        pause_active = !actx->player || !actx->player->getVideoOutput();
-        if (actx->player && actx->player->getVideoOutput())
-            allowEmbedding = actx->player->getVideoOutput()->AllowPreviewEPG();
-
-        if (!pause_active)
+        pause_active = !actx->player;
+        if (actx->player)
         {
-            long long margin = (long long)
-                (actx->last_framerate * actx->player->GetAudioStretchFactor());
-            isNearEnd = actx->player->IsNearEnd(margin);
+            pause_active = !actx->player->getVideoOutput();
+            paused = actx->player->IsPaused();
+            if (actx->player->getVideoOutput())
+                allowEmbedding = actx->player->getVideoOutput()->AllowPreviewEPG();
+            if (!pause_active)
+            {
+                long long margin = (long long)
+                    (actx->last_framerate * actx->player->GetAudioStretchFactor());
+                isNearEnd = actx->player->IsNearEnd(margin);
+            }
         }
         actx->UnlockDeletePlayer(__FILE__, __LINE__);
     }
@@ -7732 +7722 @@
     pause_active |= kScheduleProgramFinder == editType;
     pause_active |=
         !isLiveTV && (!db_continue_embedded || isNearEnd);
-    pause_active |= actx->paused;
+    pause_active |= paused;
     vector<bool> do_pause;
     do_pause.insert(do_pause.begin(), true, player.size());
     do_pause[find_player_index(actx)] = pause_active;
@@ -7875 +7865 @@
 
     ctx->ts_normal = new_ts_normal;
 
-    if (!ctx->paused)
-    {
-        ctx->LockDeletePlayer(__FILE__, __LINE__);
-        if (ctx->player)
+    ctx->LockDeletePlayer(__FILE__, __LINE__);
+    if (ctx->player && !ctx->player->IsPaused())
             ctx->player->Play(ctx->ts_normal, true);
-        ctx->UnlockDeletePlayer(__FILE__, __LINE__);
-    }
+    ctx->UnlockDeletePlayer(__FILE__, __LINE__);
 
     if (!browsehelper->IsBrowsing())
     {
@@ -9053 +9040 @@
     if (osd)
     {
         osd->DialogQuit();
-        bool was_paused = ctx->paused;
+        bool was_paused = ContextIsPaused(ctx, __FILE__, __LINE__);
         if (!was_paused)
             DoTogglePause(ctx, true);
 
@@ -9074 +9061 @@
     if (!DialogIsVisible(ctx, OSD_DLG_EDITING))
         return;
 
+    bool paused = ContextIsPaused(ctx, __FILE__, __LINE__);
+
     if (action == "STOP")
     {
         ctx->LockPlayingInfo(__FILE__, __LINE__);
         if (ctx->playingInfo)
             ctx->playingInfo->SaveEditing(false);
         ctx->UnlockPlayingInfo(__FILE__, __LINE__);
-        if (!was_paused && ctx->paused)
+        if (!was_paused && paused)
             DoTogglePause(ctx, true);
     }
     else // action == "CONTINUE"
@@ -9090 +9079 @@
         {
             ctx->playingInfo->SaveEditing(false);
             editmode = ctx->player->EnableEdit();
-            if (!editmode && !was_paused && ctx->paused)
+            if (!editmode && !was_paused && paused)
                 DoTogglePause(ctx, false);
         }
         ctx->UnlockDeletePlayer(__FILE__, __LINE__);
@@ -9594 +9583 @@
 
         StopFFRew(actx);
 
-        if (actx->paused)
+        if (ContextIsPaused(actx, __FILE__, __LINE__))
             DoTogglePause(actx, true);
 
         ChangeTimeStretch(actx, 0, !floatRead);   // just display
@@ -11218 +11207 @@
     uint chanid = 0;
     uint cardid = 0;
 
-    if (ctx->paused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__))
         return;
 
     ctx->LockPlayingInfo(__FILE__, __LINE__);
@@ -11419 +11408 @@
     if ((ctx != GetPlayer(ctx, 0)))
         return;
 
-    if (!ctx->paused)
+    if (!ContextIsPaused(ctx, __FILE__, __LINE__))
         DoTogglePause(ctx, false);
 
     QString message;
@@ -11540 +11529 @@
 
     ClearOSD(ctx);
 
-    bool paused = ctx->paused;
+    bool paused = ContextIsPaused(ctx, __FILE__, __LINE__);
     if (!paused)
         DoTogglePause(ctx, false);
 
@@ -11691 +11680 @@
     if (!lastProgram)
         return false;
 
-    bool stayPaused = ctx->paused;
-    if (!ctx->paused)
+    bool paused = ContextIsPaused(ctx, __FILE__, __LINE__);
+    bool stayPaused = paused;
+    if (!paused)
         DoTogglePause(ctx, false);
     QString recGroupPassword;
     lastProgram->SetRecordingGroup(lastProgram->QueryRecordingGroup());
@@ -11717 +11707 @@
         {
             SetOSDMessage(ctx, tr("Password Failed"));
 
-            if (ctx->paused && !stayPaused)
+            if (ContextIsPaused(ctx, __FILE__, __LINE__) && !stayPaused)
                 DoTogglePause(ctx, false);
 
             return false;
         }
     }
 
-    if (ctx->paused && !stayPaused)
+    if (ContextIsPaused(ctx, __FILE__, __LINE__) && !stayPaused)
         DoTogglePause(ctx, false);
 
     return true;
@@ -11806 +11796 @@
     ReturnPlayerLock(mctx);
 }
 
+bool TV::ContextIsPaused(PlayerContext *ctx, const char *file, int location)
+{
+    if (!ctx)
+        return false;
+    bool paused = false;
+    ctx->LockDeletePlayer(file, location);
+    if (ctx->player)
+        paused = ctx->player->IsPaused();
+    ctx->UnlockDeletePlayer(file, location);
+    return paused;
+}
+
 OSD *TV::GetOSDL(const char *file, int location)
 {
     PlayerContext *actx = GetPlayerReadLock(-1, file, location);

mythtv/libs/libmythtv/tv_play.h

@@ -307 +307 @@
     static EMBEDRETURNVOIDSCHEDIT RunScheduleEditorPtr;
 
   private:
+    bool ContextIsPaused(PlayerContext *ctx, const char *file, int location);
     void SetActive(PlayerContext *lctx, int index, bool osd_msg);
 
     PlayerContext       *GetPlayerWriteLock(
@@ -462 +463 @@
                                 const QStringList &actions);
 
     bool ClearOSD(const PlayerContext*);
-    void ToggleOSD(const PlayerContext*, bool includeStatusOSD);
+    void ToggleOSD(PlayerContext*, bool includeStatusOSD);
     void UpdateOSDProgInfo(const PlayerContext*, const char *whichInfo);
     void UpdateOSDStatus(const PlayerContext *ctx, QString title, QString desc,
                          QString value, int type, QString units,

mythtv/libs/libmythtv/tvbrowsehelper.cpp

@@ -6 +6 @@
 #include "playercontext.h"
 #include "remoteencoder.h"
 #include "recordinginfo.h"
+#include "mythplayer.h"
 #include "tv_play.h"
 
 #define GetPlayer(X,Y) GetPlayerHaveLock(X, Y, __FILE__ , __LINE__)
@@ -65 +66 @@
     if (m_ctx)
         return m_ctx == ctx;
 
-    if (ctx->paused)
+    bool paused = false;
+    ctx->LockDeletePlayer(__FILE__, __LINE__);
+    if (ctx->player)
+        paused = ctx->player->IsPaused();
+    ctx->UnlockDeletePlayer(__FILE__, __LINE__);
+    if (paused)
         return false;
 
     m_tv->ClearOSD(ctx);