Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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.
  • Loading branch information...
commit 4ae3c0d092d441cb9289454623e514d9c13a6d95 1 parent 01a5c56
Mark Kendall authored
Showing with 8 additions and 17 deletions.
  1. +8 −17 mythtv/libs/libmythtv/tv_play.cpp
View
25 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 +
Please sign in to comment.
Something went wrong with that request. Please try again.