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:35:27 (GMT)
commit074fb6e3a2795b6756d17a818ddf0aa9f258dc33 (patch)
tree2a0651546e84b933aa092a273365dad9eed55a26
parentaac81b74a2d8b79b0c49637fc647f9f1bdf2da7b (diff)
Alter the watched flag fix slightly to take into account the need to ignore post-roll for recordings, something I forgot before.
(cherry picked from commit b758ea8df0c0019b9833a274f73484e71bf8c2b2)
-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 8e75efb..79d9551 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3057,10 +3057,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;