Ticket #2648: xrandr_gui.diff
File xrandr_gui.diff, 3.7 KB (added by , 17 years ago) |
---|
-
mythtv-vid/libs/libmythtv/tv_play.cpp
4940 4940 mwnd->setGeometry(saved_gui_bounds.left(), saved_gui_bounds.top(), 4941 4941 saved_gui_bounds.width(), saved_gui_bounds.height()); 4942 4942 mwnd->setFixedSize(saved_gui_bounds.size()); 4943 if (nvp && nvp->getVideoOutput()) 4944 nvp->getVideoOutput()->ResizeForGui(); 4943 4945 } 4944 4946 4945 4947 // Collect channel info … … 5011 5013 mwnd->setGeometry(player_bounds.left(), player_bounds.top(), 5012 5014 player_bounds.width(), player_bounds.height()); 5013 5015 mwnd->setFixedSize(player_bounds.size()); 5016 if (nvp && nvp->getVideoOutput()) 5017 nvp->getVideoOutput()->ResizeForVideo(); 5014 5018 } 5015 5019 5016 5020 // 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); 77 77 void EmbedInWidget(WId wid, int x, int y, int w, int h); 78 78 void StopEmbedding(void); 79 void ResizeForGui(void); 80 void ResizeForVideo(void); 79 81 void DrawUnusedRects(bool sync = true); 80 82 void UpdatePauseFrame(void); 81 83 int SetPictureAttribute(int attribute, int newValue); -
mythtv-vid/libs/libmythtv/videoout_xv.cpp
376 376 } 377 377 } 378 378 379 /** 380 * \fn VideoOutputXv::ResizeForVideo(void) 381 * Public version of ResizeForVideo. 382 * 383 * Called by the video player to resize the screen 384 * e.g. after we have finished displaying the EPG. 385 * 386 */ 387 void VideoOutputXv::ResizeForVideo(void) 388 { 389 if (display_res) 390 { 391 display_res->SwitchToVideo(video_dim.width(), video_dim.height()); 392 } 393 } 394 395 /** 396 * \fn VideoOutputXv::ResizeForGui(void) 397 * Resizes the screen before displaying any GUI elements (if 398 * we are using DisplayRes). 399 * 400 */ 401 void VideoOutputXv::ResizeForGui(void) 402 { 403 if (display_res) 404 { 405 display_res->SwitchToGUI(); 406 } 407 } 408 379 409 /** 380 410 * \fn VideoOutputXv::InitDisplayMeasurements(uint width, uint height) 381 411 * \brief Init display measurements based on database settings and … … 1885 1915 XJ_curwin = wid; 1886 1916 1887 1917 VideoOutput::EmbedInWidget(wid, x, y, w, h); 1888 1889 // Switch to GUI size1890 if (display_res)1891 display_res->SwitchToGUI();1892 1918 } 1893 1919 1894 1920 void VideoOutputXv::StopEmbedding(void) … … 1900 1926 1901 1927 XJ_curwin = XJ_win; 1902 1928 VideoOutput::StopEmbedding(); 1903 1904 // Switch back to resolution for full screen video1905 if (display_res)1906 display_res->SwitchToVideo(video_dim.width(), video_dim.height());1907 1929 } 1908 1930 1909 1931 VideoFrame *VideoOutputXv::GetNextFreeFrame(bool /*allow_unsafe*/) -
mythtv-vid/libs/libmythtv/videooutbase.h
182 182 183 183 virtual void EmbedInWidget(WId wid, int x, int y, int w, int h); 184 184 virtual void StopEmbedding(void); 185 virtual void ResizeForGui(void) { }; 186 virtual void ResizeForVideo(void) { }; 185 187 186 188 virtual void MoveResize(void); 187 189 virtual void Zoom(int direction);