Ticket #7994: clear_bookmark_at_end.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/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

@@ -3095 +3095 @@
     {
         if (bookmark_it && !(ctx->nvp->IsNearEnd()))
             ctx->nvp->SetBookmark();
+        if (IsBookmarkAllowed(ctx) && ctx->nvp->IsNearEnd(-1, true))
+            ctx->nvp->ClearBookmark();
         if (db_auto_set_watched)
             ctx->nvp->SetWatched();
     }