summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-01-28 14:54:56 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-01-29 03:25:27 (GMT)
commit8d1c058411db38440740bbc5b0957edb09171c04 (patch)
treed6a2de2f34702638ac4e582961ddf862508bc64a
parent92507725409a00d98b07d6623baa032834f728d3 (diff)
Pause the RingBuffer before pausing the decoder.
If the RingBuffer has reached, or is very close to, the end of the file then it may be in a wait state. Pausing the RingBuffer clears this wait state and hence frees up the decoder thread so that it can be paused quickly. (cherry picked from commit c3e1879e0c284b3c22676ee50fb002d4bd994ce7)
-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 1c1b6f7..669532f 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -338,8 +338,8 @@ bool MythPlayer::Pause(void)
next_normal_speed = false;
PauseVideo();
audio.Pause(true);
- PauseDecoder();
PauseBuffer();
+ PauseDecoder();
allpaused = decoderPaused && videoPaused && bufferPaused;
{
QMutexLocker locker(&decoder_change_lock);