Ticket #13234: 20180425_1504_bkmark_and_pause.patch

mythtv/libs/libmythtv/tv_play.cpp

@@ -5056 +5056 @@
             ctx->player->SetBookmark(true);
             SetOSDMessage(ctx, tr("Bookmark Cleared"));
         }
-        else if (IsBookmarkAllowed(ctx))
+        else // if (IsBookmarkAllowed(ctx))
         {
             ctx->player->SetBookmark();
             osdInfo info;
@@ -5080 +5080 @@
 
     if (has_action(ACTION_SETBOOKMARK, actions))
     {
-        if (!islivetv || !CommitQueuedInput(ctx))
+        if (!CommitQueuedInput(ctx))
         {
             ctx->LockDeletePlayer(__FILE__, __LINE__);
             SetBookmark(ctx, false);
@@ -5089 +5089 @@
     }
     if (has_action(ACTION_TOGGLEBOOKMARK, actions))
     {
-        if (!islivetv || !CommitQueuedInput(ctx))
+        if (!CommitQueuedInput(ctx))
         {
             ctx->LockDeletePlayer(__FILE__, __LINE__);
             SetBookmark(ctx, ctx->player->GetBookmark());
@@ -6611 +6611 @@
     if (osd && osd->DialogVisible(OSD_DLG_NAVIGATE))
     {
         osdInfo info;
-        bool paused = ContextIsPaused(ctx, __FILE__, __LINE__);
+        ctx->LockDeletePlayer(__FILE__, __LINE__);
+        bool paused = (ctx->player
+            && (ctx->ff_rew_state || ctx->ff_rew_speed != 0
+                || ctx->player->IsPaused()));
+        ctx->UnlockDeletePlayer(__FILE__, __LINE__);
         info.text["paused"] = (paused ? "Y" : "N");
         bool muted = ctx->player->IsMuted();
         info.text["muted"] = (muted ? "Y" : "N");
@@ -6773 +6777 @@
                    /*timeIsOffset*/true,
                    /*honorCutlist*/!(flags & kIgnoreCutlist));
     }
+    UpdateNavDialog(actx);
     return true;
 }
 
@@ -11154 +11159 @@
             DoQueueTranscode(actx, "Medium Quality");
         else if (action == "QUEUETRANSCODE_LOW")
             DoQueueTranscode(actx, "Low Quality");
-        else if (action == ACTION_TOGGLEBOOKMARK
-                || action == ACTION_SETBOOKMARK)
-            ActivePostQHandleAction(actx, QStringList(action));
         else
             handled = false;
     }
@@ -11167 +11169 @@
         handled = ActiveHandleAction(actx, QStringList(action), isDVD, isMenuOrStill);
     }
     if (!handled)
+            handled = ActivePostQHandleAction(actx, QStringList(action));
+
+    if (!handled)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC +
             "Unknown menu action selected: " + action);