summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2010-11-27 02:02:53 (GMT)
committer David Engel <dengel@mythtv.org>2010-11-27 02:02:53 (GMT)
commit473ffaef119f9a58cd98e0669730308dc37fa666 (patch)
treee309c6ba143a87e2fadb38cee9ed239f8dbf31f8
parentf70abbec8983c71432bcf8576a78aa87447c3312 (diff)
Backport [27356] from trunk to 0.24-fixes
Fix the response time repositioning when exiting FF/Rew. It was broken in [26483] when a called to DoJumpToFrame() was added and overwrote the repositioning that was still pending. This change accounts for the repositioning when calling DoJumpToFrame(). git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27357 7dbf422c-18fa-0310-86e9-fd20926502f2
-rw-r--r--mythtv/libs/libmythtv/mythplayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index 56e2125..f522cf8 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -3185,7 +3185,7 @@ void MythPlayer::ChangeSpeed(void)
videoOutput->SetPrebuffering(ffrew_skip == 1);
decoder->setExactSeeks(exactseeks && ffrew_skip == 1);
if (play_speed != 0.0f && !(last_speed == 0.0f && ffrew_skip == 1))
- DoJumpToFrame(framesPlayed);
+ DoJumpToFrame(framesPlayed + fftime - rewindtime);
}
VERBOSE(VB_PLAYBACK, LOC + "Play speed: " +