Ticket #2648: xrandr_gui.diff

mythtv-vid/libs/libmythtv/tv_play.cpp

@@ -4940 +4940 @@
         mwnd->setGeometry(saved_gui_bounds.left(), saved_gui_bounds.top(),
                           saved_gui_bounds.width(), saved_gui_bounds.height());
         mwnd->setFixedSize(saved_gui_bounds.size());
+        if (nvp && nvp->getVideoOutput())
+            nvp->getVideoOutput()->ResizeForGui();
     }
 
     // Collect channel info
@@ -5011 +5013 @@
         mwnd->setGeometry(player_bounds.left(), player_bounds.top(),
                           player_bounds.width(), player_bounds.height());
         mwnd->setFixedSize(player_bounds.size());
+        if (nvp && nvp->getVideoOutput())
+            nvp->getVideoOutput()->ResizeForVideo();
     }
 
     // If user selected a new channel in the EPG, change to that channel

mythtv-vid/libs/libmythtv/videoout_xv.h

@@ -76 +76 @@
     void VideoAspectRatioChanged(float aspect);
     void EmbedInWidget(WId wid, int x, int y, int w, int h);
     void StopEmbedding(void);
+    void ResizeForGui(void);
+    void ResizeForVideo(void);
     void DrawUnusedRects(bool sync = true);
     void UpdatePauseFrame(void);
     int  SetPictureAttribute(int attribute, int newValue);

mythtv-vid/libs/libmythtv/videoout_xv.cpp

@@ -376 +376 @@
     }
 }
 
+/**
+ * \fn VideoOutputXv::ResizeForVideo(void)
+ * Public version of ResizeForVideo.
+ *
+ * Called by the video player to resize the screen
+ * e.g. after we have finished displaying the EPG.
+ *
+ */
+void VideoOutputXv::ResizeForVideo(void)
+{
+    if (display_res)
+    {
+        display_res->SwitchToVideo(video_dim.width(), video_dim.height());
+    }
+}
+
+/**
+ * \fn VideoOutputXv::ResizeForGui(void)
+ * Resizes the screen before displaying any GUI elements (if
+ * we are using DisplayRes).
+ *
+ */
+void VideoOutputXv::ResizeForGui(void)
+{
+    if (display_res)
+    {
+        display_res->SwitchToGUI();
+    }
+}
+
 /**
  * \fn VideoOutputXv::InitDisplayMeasurements(uint width, uint height)
  * \brief Init display measurements based on database settings and
@@ -1885 +1915 @@
     XJ_curwin = wid;
 
     VideoOutput::EmbedInWidget(wid, x, y, w, h);
-
-    // Switch to GUI size
-    if (display_res)
-        display_res->SwitchToGUI();
 }
 
 void VideoOutputXv::StopEmbedding(void)
@@ -1900 +1926 @@
 
     XJ_curwin = XJ_win;
     VideoOutput::StopEmbedding();
-
-    // Switch back to resolution for full screen video
-    if (display_res)
-        display_res->SwitchToVideo(video_dim.width(), video_dim.height());
 }
 
 VideoFrame *VideoOutputXv::GetNextFreeFrame(bool /*allow_unsafe*/)

mythtv-vid/libs/libmythtv/videooutbase.h

@@ -182 +182 @@
 
     virtual void EmbedInWidget(WId wid, int x, int y, int w, int h);
     virtual void StopEmbedding(void);
+    virtual void ResizeForGui(void) { };
+    virtual void ResizeForVideo(void) { };
 
     virtual void MoveResize(void);
     virtual void Zoom(int direction);