Ticket #2648: xrandr2.diff

libs/libmythtv/tv_play.cpp

@@ -5788 +5788 @@
         return;
 
     // Resize window to the MythTV GUI size
+    if (nvp && nvp->getVideoOutput()) 
+        nvp->getVideoOutput()->ResizeForGui(); 
     MythMainWindow *mwnd = gContext->GetMainWindow();
     bool using_gui_size_for_tv = gContext->GetNumSetting("GuiSizeForTV", 0);
     if (!using_gui_size_for_tv)
@@ -5874 +5876 @@
                           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
     if (changeChannel.size())

libs/libmythtv/videoout_xv.h

@@ -84 +84 @@
     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(PictureAttribute attribute, int newValue);

libs/libmythtv/videoout_xv.cpp

@@ -377 +377 @@
     return (int)rate;
 }
 
+void VideoOutputXv::ResizeForVideo(void) 
+{
+    ResizeForVideo(video_dim.width(), video_dim.height());
+}
+
+void VideoOutputXv::ResizeForGui(void)
+{
+    if (display_res)
+        display_res->SwitchToGUI();
+}
+
 /**
  * \fn VideoOutputXv::ResizeForVideo(uint width, uint height)
  * Sets display parameters based on video resolution.
@@ -2376 +2387 @@
     XJ_curwin = wid;
 
     VideoOutput::EmbedInWidget(wid, x, y, w, h);
-
-    // Switch to GUI size
-    if (display_res)
-        display_res->SwitchToGUI();
 }
 
 void VideoOutputXv::StopEmbedding(void)
@@ -2391 +2398 @@
 
     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*/)

libs/libmythtv/videooutbase.h

@@ -66 +66 @@
 
     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(ZoomDirection direction);