summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-02-14 12:45:59 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-02-14 12:45:59 (GMT)
commit4ae3c0d092d441cb9289454623e514d9c13a6d95 (patch)
tree847d4d2f81be242717139ca408f934b407231751
parent01a5c56e3f98291a67a4277431a7c9df30da8433 (diff)
TV: Hide and disable the main UI at the last moment.
This consolidates some duplicated code in TV::HandleStateChange to ensure that the various actions required to hide and disable the main ui (and screensaver) are the last significant actions before we enter the main playback loop.
-rw-r--r--mythtv/libs/libmythtv/tv_play.cpp25
1 files changed, 8 insertions, 17 deletions
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 65168f2..2471881 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -1881,13 +1881,6 @@ void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)
VERBOSE(VB_IMPORTANT, "We have a RingBuffer");
- if (GetMythMainWindow() && !weDisabledGUI)
- {
- weDisabledGUI = true;
- GetMythMainWindow()->PushDrawDisabled();
- DrawUnusedRects();
- }
-
if (ctx->playingInfo && StartRecorder(ctx,-1))
{
ok = StartPlayer(mctx, ctx, desiredNextState);
@@ -1903,7 +1896,6 @@ void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)
}
else if (!ctx->IsPIP())
{
- GetMythUI()->DisableScreensaver();
if (!lastLockSeenTime.isValid() ||
(lastLockSeenTime < timerOffTime))
{
@@ -1951,15 +1943,6 @@ void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)
if (ctx->buffer && ctx->buffer->IsOpen())
{
- GetMythUI()->DisableScreensaver();
-
- if (GetMythMainWindow() && !weDisabledGUI)
- {
- weDisabledGUI = true;
- GetMythMainWindow()->PushDrawDisabled();
- DrawUnusedRects();
- }
-
if (desiredNextState == kState_WatchingRecording)
{
ctx->LockPlayingInfo(__FILE__, __LINE__);
@@ -2111,6 +2094,8 @@ void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)
TRANSITION(kState_None, kState_WatchingRecording) ||
TRANSITION(kState_None, kState_WatchingLiveTV))
{
+ if (!ctx->IsPIP())
+ GetMythUI()->DisableScreensaver();
MythMainWindow *mainWindow = GetMythMainWindow();
mainWindow->setBaseSize(player_bounds.size());
mainWindow->setMinimumSize(
@@ -2120,6 +2105,12 @@ void TV::HandleStateChange(PlayerContext *mctx, PlayerContext *ctx)
QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
mainWindow->setGeometry(player_bounds);
GetMythMainWindow()->GetPaintWindow()->hide();
+ if (!weDisabledGUI)
+ {
+ weDisabledGUI = true;
+ GetMythMainWindow()->PushDrawDisabled();
+ }
+ DrawUnusedRects();
}
VERBOSE(VB_PLAYBACK, LOC +