Ticket #6790: tvwin_fixes.diff

mythtv/libs/libmythtv/tv_play.cpp

@@ -897 +897 @@
         // player window sizing
         MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
 
-        myWindow = new TvPlayWindow(mainStack, "Playback");
+        myWindow = new TvPlayWindow(mainStack);
 
         if (myWindow->Create())
             mainStack->AddScreen(myWindow, false);
@@ -908 +908 @@
         }
 
         MythMainWindow *mainWindow = GetMythMainWindow();
-        //QPalette p = mainWindow->palette();
-        //p.setColor(mainWindow->backgroundRole(), Qt::black);
-        //mainWindow->setPalette(p);
         mainWindow->installEventFilter(this);
         qApp->processEvents();
     }
@@ -987 +984 @@
     }
     ReturnPlayerLock(mctx);
 
-    GetMythMainWindow()->GetPaintWindow()->show();
+    //GetMythMainWindow()->SetDrawEnabled(true);
 
     VERBOSE(VB_PLAYBACK, "TV::~TV() -- end");
 }
@@ -2002 +1999 @@
             (db_use_fixed_size) ? player_bounds.size() :
             QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX));
         mainWindow->setGeometry(player_bounds);
-
-        // hide the GUI paint window
-        GetMythMainWindow()->GetPaintWindow()->hide();
     }
 
     VERBOSE(VB_PLAYBACK, LOC +
@@ -4871 +4865 @@
     if (StateIsLiveTV(mctx->GetState()))
         mctx->buffer->Unpause();
 
-    bool ok = mctx->CreateNVP(
-        this, gContext->GetMainWindow(), mctx->GetState(), 0, &mctx->embedBounds);
+    QWidget *widget = gContext->GetMainWindow()->GetPaintWindow();
 
+    bool ok = mctx->CreateNVP(this, widget, mctx->GetState(), 0,
+                              &mctx->embedBounds);
+
     if (ok)
     {
         ScheduleStateChange(mctx);
@@ -4995 +4991 @@
     }
     else
     {
-        ok = ctx->CreateNVP(this, gContext->GetMainWindow(), desiredState,
+        QWidget *widget = gContext->GetMainWindow()->GetPaintWindow();
+        
+        ok = ctx->CreateNVP(this, widget, desiredState,
                             mctx->embedWinID, &mctx->embedBounds);
         ScheduleStateChange(ctx);
     }
@@ -5382 +5380 @@
     mctx->SetPIPState(kPIPOff);
     mctx->buffer->Seek(0, SEEK_SET);
 
-    if (mctx->CreateNVP(this, gContext->GetMainWindow(), mctx->GetState(),
+    QWidget *widget = gContext->GetMainWindow()->GetPaintWindow();
+    
+    if (mctx->CreateNVP(this, widget, mctx->GetState(),
                         mctx->embedWinID, &mctx->embedBounds))
     {
         ScheduleStateChange(mctx);
@@ -7923 +7923 @@
     }
     else
     {
-        //we are embedding in a mythui window so show the gui paint window again
-        GetMythMainWindow()->GetPaintWindow()->show();
+        //we are embedding in a mythui window so re-enable drawing
+        //GetMythMainWindow()->SetDrawEnabled(true);
     }
 }
 
@@ -7935 +7935 @@
     // this will create the program guide window (widget)
     // on the main thread and avoid a deadlock on Win32
     QString message = QString("START_EPG %1").arg(editType);
+    //GetMythMainWindow()->SetDrawEnabled(true);
     MythEvent* me = new MythEvent(message);
     qApp->postEvent(gContext->GetMainWindow(), me);
 }
@@ -8614 +8615 @@
         PlayerContext *mctx;
         MythMainWindow *mwnd = gContext->GetMainWindow();
 
+        GetMythMainWindow()->GetPaintWindow()->clearMask();
+        //GetMythMainWindow()->SetDrawEnabled(false);
+        
         StopEmbedding(actx);                // Undo any embedding
         SetPlayerVisibility(actx, kVisibility_Normal);
-
+        
         mctx = GetPlayerReadLock(0, __FILE__, __LINE__);
         mctx->LockDeleteNVP(__FILE__, __LINE__);
         if (mctx->nvp && mctx->nvp->getVideoOutput())
@@ -8634 +8638 @@
 
         DoSetPauseState(actx, saved_pause); // Restore pause states
 
-        GetMythMainWindow()->GetPaintWindow()->hide();
-        GetMythMainWindow()->GetPaintWindow()->clearMask();
-
         qApp->processEvents();
         DrawUnusedRects(true, actx);
 

mythtv/libs/libmythtv/NuppelVideoPlayer.cpp

@@ -720 +720 @@
         {
             MythMainWindow *window = gContext->GetMainWindow();
 
-            QWidget *widget =
-                window->findChild<QWidget*>("video playback window");
+            QWidget *widget = window->GetPaintWindow();
 
             if (!widget)
             {
@@ -738 +737 @@
             return false;
         }
 
+        // Suspend GUI painting
+        //GetMythMainWindow()->SetDrawEnabled(false);
+
         QRect display_rect;
         int pbp_width = widget->width() / 2;
         if (pipState == kPIPStandAlone)

mythtv/libs/libmythtv/tv_play_win.cpp

@@ -9 +9 @@
 #include "tv_play_win.h"
 
 
-TvPlayWindow::TvPlayWindow(MythScreenStack *parent, const char *name)
-            : MythScreenType(parent, name)
+TvPlayWindow::TvPlayWindow(MythScreenStack *parent)
+             : MythScreenType(parent, "video playback window")
 {
     SetCanTakeFocus(true);
 }

mythtv/libs/libmythtv/tv_play_win.h

@@ -12 +12 @@
     Q_OBJECT
 
   public:
-    TvPlayWindow(MythScreenStack *parent, const char *name);
+    TvPlayWindow(MythScreenStack *parent);
    ~TvPlayWindow();
 
     virtual void gestureEvent(MythUIType *, MythGestureEvent *);