summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-01 01:37:31 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-01 02:02:25 (GMT)
commitd85343b84e13455367f55e23087ba3e5d6789c35 (patch)
tree7df2361c77f2d9b54b3bf49694957754086e9fca
parent8d1c058411db38440740bbc5b0957edb09171c04 (diff)
Skip past the initial cut area when starting playback.
Patch from billstuff2001 at sbcglobal dot net Closes #9538 (cherry picked from commit 48590321e09bd2c6473040caa0a695d7453c215f)
-rw-r--r--mythtv/libs/libmythtv/mythplayer.cpp2
-rw-r--r--mythtv/libs/libmythtv/mythplayer.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index 669532f..ea14af9 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -988,7 +988,9 @@ int MythPlayer::OpenFile(uint retries, bool allow_libmpeg2)
deleteMap.TrackerReset(0, totalFrames);
}
+ // Determine the initial bookmark and update it for the cutlist
bookmarkseek = GetBookmark();
+ deleteMap.TrackerWantsToJump(bookmarkseek, totalFrames, bookmarkseek);
if (player_ctx->playingInfo->QueryAutoExpire() == kLiveTVAutoExpire)
gCoreContext->SaveSetting("DefaultChanid",
diff --git a/mythtv/libs/libmythtv/mythplayer.h b/mythtv/libs/libmythtv/mythplayer.h
index 7625d45..2003914 100644
--- a/mythtv/libs/libmythtv/mythplayer.h
+++ b/mythtv/libs/libmythtv/mythplayer.h
@@ -567,7 +567,7 @@ class MPUBLIC MythPlayer
int jumpchapter;
// Bookmark stuff
- long long bookmarkseek;
+ uint64_t bookmarkseek;
// Seek
/// If fftime>0, number of frames to seek forward.