Ticket #6605: mythtv_LiveTV_Forcing_JumpTo_1.diff

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -3252 +3252 @@
         ClearSubtitles();
     }
 
+    VERBOSE(VB_PLAYBACK, QString("SwitchToProgram(void) "
+            "discont: %1 newtype: %2 newid: %3 eof: %4")
+            .arg(discontinuity).arg(newtype).arg(newid).arg(eof));
+
     if (discontinuity || newtype)
     {
         player_ctx->tvchain->SetProgram(*pginfo);
@@ -3310 +3314 @@
 
     player_ctx->buffer->Unpause();
 
+    eof = false;
+
     player_ctx->SetNVPChangingBuffers(false);
 
     player_ctx->LockPlayingInfo(__FILE__, __LINE__);
@@ -3413 +3419 @@
         GetDecoder()->setExactSeeks(seeks);
     }
 
+    player_ctx->SetNVPChangingBuffers(false);
     eof = false;
 }
 
@@ -3582 +3589 @@
                 SwitchToProgram();
         }
 
-        if (player_ctx->tvchain && player_ctx->tvchain->NeedsToJump() &&
-            !GetDecoder()->GetWaitForChange())
+        if (player_ctx->tvchain && player_ctx->tvchain->NeedsToJump())
         {
             JumpToProgram();
         }

mythtv/libs/libmythtv/decoderbase.cpp

@@ -75 +75 @@
     framesPlayed = 0;
     framesRead = 0;
 
+    waitingForChange = false;
     ateof = false;
 }