summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-03 02:12:02 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-03 02:12:02 (GMT)
commit0100e7777e4545d06ab69d41416972d37e221b41 (patch)
tree0d98932ad4f040a3044225a0dea4dfc9c1b7a507
parent51e34863f2c3b62da469c27a10e259fc80fe91b9 (diff)
fixes/0.24: Revert Pause/Unpause changes.
This reverts both 57812c6f8af8ceb45144 and 8d1c058411db38440740. The pause/unpause behaviour should now be as it was for the 0.24 release.
-rw-r--r--mythtv/libs/libmythtv/mythplayer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp
index ea14af9..378b61e 100644
--- a/mythtv/libs/libmythtv/mythplayer.cpp
+++ b/mythtv/libs/libmythtv/mythplayer.cpp
@@ -336,10 +336,10 @@ bool MythPlayer::Pause(void)
}
next_play_speed = 0.0;
next_normal_speed = false;
+ PauseDecoder();
PauseVideo();
audio.Pause(true);
PauseBuffer();
- PauseDecoder();
allpaused = decoderPaused && videoPaused && bufferPaused;
{
QMutexLocker locker(&decoder_change_lock);
@@ -367,10 +367,10 @@ bool MythPlayer::Play(float speed, bool normal, bool unpauseaudio)
}
UnpauseBuffer();
- UnpauseDecoder();
if (unpauseaudio)
audio.Pause(false);
UnpauseVideo();
+ UnpauseDecoder();
allpaused = false;
next_play_speed = speed;
next_normal_speed = normal;