# HG changeset patch # User ib # Date 1309173801 0 # Node ID ede9413501daaad544d57126683a541e3cbf0a64 # Parent 4af19d03b4e8e9bef3b9bdb4a6819750fca88d0b Rename guiGetEvent type guiSetShVideo guiSetVideo. diff -r 4af19d03b4e8 -r ede9413501da gui/interface.c --- a/gui/interface.c Mon Jun 27 10:46:25 2011 +0000 +++ b/gui/interface.c Mon Jun 27 11:23:21 2011 +0000 @@ -615,7 +615,7 @@ guiInfo.afilter = arg; break; - case guiSetShVideo: + case guiSetVideo: if (!guiApp.subWindow.isFullScreen) { wsResizeWindow(&guiApp.subWindow, vo_dwidth, vo_dheight); diff -r 4af19d03b4e8 -r ede9413501da gui/interface.h --- a/gui/interface.h Mon Jun 27 10:46:25 2011 +0000 +++ b/gui/interface.h Mon Jun 27 11:23:21 2011 +0000 @@ -43,7 +43,7 @@ #define guiSetFileName 4 #define guiSetAudioOnly 6 #define guiReDrawSubWindow 7 -#define guiSetShVideo 8 +#define guiSetVideo 8 #define guiSetStream 9 #define guiReDraw 10 #define guiSetVolume 11 diff -r 4af19d03b4e8 -r ede9413501da gui/win32/interface.c --- a/gui/win32/interface.c Mon Jun 27 10:46:25 2011 +0000 +++ b/gui/win32/interface.c Mon Jun 27 11:23:21 2011 +0000 @@ -614,7 +614,7 @@ } break; } - case guiSetShVideo: + case guiSetVideo: { guiInfo.MovieWidth = vo_dwidth; guiInfo.MovieHeight = vo_dheight; diff -r 4af19d03b4e8 -r ede9413501da libvo/video_out.c --- a/libvo/video_out.c Mon Jun 27 10:46:25 2011 +0000 +++ b/libvo/video_out.c Mon Jun 27 11:23:21 2011 +0000 @@ -372,7 +372,7 @@ #ifdef CONFIG_GUI if (use_gui) { // GUI creates and manages window for us - guiGetEvent(guiSetShVideo, 0); + guiGetEvent(guiSetVideo, 0); } #endif } diff -r 4af19d03b4e8 -r ede9413501da libvo/vo_dxr3.c --- a/libvo/vo_dxr3.c Mon Jun 27 10:46:25 2011 +0000 +++ b/libvo/vo_dxr3.c Mon Jun 27 11:23:21 2011 +0000 @@ -491,7 +491,7 @@ vo_dheight = d_height; #ifdef CONFIG_GUI if (use_gui) - guiGetEvent(guiSetShVideo, 0); + guiGetEvent(guiSetVideo, 0); #endif XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs); depth = xwin_attribs.depth; diff -r 4af19d03b4e8 -r ede9413501da libvo/vo_xover.c --- a/libvo/vo_xover.c Mon Jun 27 10:46:25 2011 +0000 +++ b/libvo/vo_xover.c Mon Jun 27 11:23:21 2011 +0000 @@ -269,7 +269,7 @@ vo_dwidth=d_width; vo_dheight=d_height; #ifdef CONFIG_GUI - if(use_gui) guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window + if(use_gui) guiGetEvent( guiSetVideo,0 ); // the GUI will set up / resize the window else { #endif