Ticket #7994: clear_bookmark_at_end_2.patch

libs/libmythtv/NuppelVideoPlayer.cpp

@@ -4627 +4652 @@
  *  \param margin minimum number of frames we want before being near end,
  *                defaults to 2 seconds of video.
  */
-bool NuppelVideoPlayer::IsNearEnd(long long margin) const
+bool NuppelVideoPlayer::IsNearEnd(long long margin, bool allowVideo) const
 {
     long long framesRead, framesLeft = 0;
 
     player_ctx->LockPlayingInfo(__FILE__, __LINE__);
-    if (!player_ctx->playingInfo || player_ctx->playingInfo->isVideo ||
+    if (!player_ctx->playingInfo || (player_ctx->playingInfo->isVideo && !allowVideo) ||
         !GetDecoder())
     {
         player_ctx->UnlockPlayingInfo(__FILE__, __LINE__);
@@ -4648 +4673 @@
     framesRead = GetDecoder()->GetFramesRead();
 
     if (player_ctx && !player_ctx->IsPIP() &&
-        player_ctx->GetState() == kState_WatchingPreRecorded)
+        (player_ctx->GetState() == kState_WatchingPreRecorded ||
+         player_ctx->GetState() == kState_WatchingVideo ||
+         player_ctx->GetState() == kState_WatchingDVD))
     {
         framesLeft = margin;
         if (!editmode && hasdeletetable && IsInDelete(framesRead))

libs/libmythtv/tv_play.h

@@ -342 +343 @@
     void ForceNextStateNone(PlayerContext*);
     void ScheduleStateChange(PlayerContext*);
     void SetErrored(PlayerContext*);
+    enum BookmarkAction {
+        kBookmarkAlways,
+        kBookmarkNever,
+        kBookmarkAuto // set iff db_playback_exit_prompt==2
+    };
     void PrepareToExitPlayer(PlayerContext*, int line,
-                             bool bookmark = true) const;
+                             BookmarkAction bookmark = kBookmarkAuto) const;
     void SetExitPlayer(bool set_it, bool wants_to) const;
     void SetUpdateOSDPosition(bool set_it);
 

libs/libmythtv/NuppelVideoPlayer.h

@@ -205 +205 @@
     bool    AtNormalSpeed(void) const         { return next_normal_speed; }
     bool    IsDecoderThreadAlive(void) const  { return decoder_thread_alive; }
     bool    IsReallyNearEnd(void) const;
-    bool    IsNearEnd(long long framesRemaining = -1) const;
+    bool    IsNearEnd(long long framesRemaining = -1, bool allowVideo = false) const;
     bool    PlayingSlowForPrebuffer(void) const { return m_playing_slower; }
     bool    HasAudioIn(void) const            { return !no_audio_in; }
     bool    HasAudioOut(void) const           { return !no_audio_out; }

libs/libmythtv/tv_play.cpp

@@ -3087 +3087 @@
     errorRecoveryTimerId = StartTimer(1, __LINE__);
 }
 
-void TV::PrepareToExitPlayer(PlayerContext *ctx, int line, bool bookmark) const
+void TV::PrepareToExitPlayer(PlayerContext *ctx, int line, BookmarkAction bookmark) const
 {
-    bool bookmark_it = bookmark && IsBookmarkAllowed(ctx);
+    bool bm_basic = (bookmark == kBookmarkAlways ||
+                     (bookmark == kBookmarkAuto && db_playback_exit_prompt == 2));
+    bool bookmark_it = bm_basic && IsBookmarkAllowed(ctx);
     ctx->LockDeleteNVP(__FILE__, line);
     if (ctx->nvp)
     {
-        if (bookmark_it && !(ctx->nvp->IsNearEnd()))
-            ctx->nvp->SetBookmark();
+        if (bookmark_it)
+        {
+            if (ctx->nvp->IsNearEnd(-1, true))
+                ctx->nvp->ClearBookmark();
+            else
+                ctx->nvp->SetBookmark();
+        }
         if (db_auto_set_watched)
             ctx->nvp->SetWatched();
     }
@@ -3162 +3169 @@
         if (mctx == ctx)
         {
             endOfRecording = true;
-            PrepareToExitPlayer(mctx, __LINE__, false);
+            PrepareToExitPlayer(mctx, __LINE__);
             SetExitPlayer(true, true);
         }
     }
@@ -3867 +3897 @@
     else if (has_action("ESCAPE", actions) && isnearend)
     {
         requestDelete = false;
-        PrepareToExitPlayer(actx, __LINE__, false);
+        PrepareToExitPlayer(actx, __LINE__);
         SetExitPlayer(true, true);
     }
     else if (has_action("SELECT", actions)  ||
@@ -3932 +3962 @@
                     DoTogglePause(actx, true);
                     break;
                 case 1:
-                    PrepareToExitPlayer(actx, __LINE__);
+                    PrepareToExitPlayer(actx, __LINE__, kBookmarkAlways);
                     SetExitPlayer(true, true);
                     break;
                 case 3:
@@ -3941 +3971 @@
                         actx, tr("Delete this recording?"));
                     return handled;
                 default:
-                    PrepareToExitPlayer(actx, __LINE__, false);
+                    PrepareToExitPlayer(actx, __LINE__, kBookmarkNever);
                     SetExitPlayer(true, true);
                     break;
             }
@@ -3966 +3996 @@
                 default:
                     if (isnearend)
                     {
-                        PrepareToExitPlayer(actx, __LINE__, false);
+                        PrepareToExitPlayer(actx, __LINE__);
                         SetExitPlayer(true, true);
                     }
                     else
@@ -4445 +4475 @@
                 PromptStopWatchingRecording(ctx);
                 return handled;
             }
-            PrepareToExitPlayer(ctx, __LINE__, db_playback_exit_prompt == 2);
+            PrepareToExitPlayer(ctx, __LINE__);
             requestDelete = false;
             do_exit = true;
         }
@@ -8783 +8817 @@
         for (uint i = 0; mctx && (i < player.size()); i++)
         {
             PlayerContext *ctx = GetPlayer(mctx, i);
-            PrepareToExitPlayer(ctx, __LINE__, db_playback_exit_prompt == 1 ||
-                                               db_playback_exit_prompt == 2);
+            PrepareToExitPlayer(ctx, __LINE__);
         }
 
         SetExitPlayer(true, true);