summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStuart Morgan <smorgan@mythtv.org>2012-02-14 16:25:06 (GMT)
committer Stuart Morgan <smorgan@mythtv.org>2012-02-14 16:32:08 (GMT)
commitb758ea8df0c0019b9833a274f73484e71bf8c2b2 (patch)
treedfcfdbf2caba09f743bf21aecd45ecd0763594ee
parent1f6d42e3f54648e54da1df8e2f4fc29cb0690389 (diff)
Alter the watched flag fix slightly to take into account the need to ignore post-roll for recordings, something I forgot before.
-rw-r--r--mythtv/libs/libmythtv/mythplayer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index dfe5126..e36a240 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3241,10 +3241,13 @@ void MythPlayer::SetWatched(bool forceWatched)
long long numFrames = totalFrames;
- // Handle in-progress recordings where totalFrames doesn't represent
- // the full length of the recording
+ // For recordings we want to ignore the post-roll and account for
+ // in-progress recordings where totalFrames doesn't represent
+ // the full length of the recording. For videos we can only rely on
+ // totalFrames as duration metadata can be wrong
if (player_ctx->playingInfo->IsRecording() &&
- player_ctx->playingInfo->GetRecordingStatus() == rsRecording)
+ player_ctx->playingInfo->QueryTranscodeStatus() !=
+ TRANSCODING_COMPLETE)
{
uint endtime;