Mercurial > mplayer.hg
changeset 33653:86819da22c57
Rename guiGetEvent type guiSetVideo guiSetVideoWindow.
| author | ib |
|---|---|
| date | Mon, 27 Jun 2011 14:04:13 +0000 |
| parents | 5a3aacc91076 |
| children | 90f7a7266410 |
| files | gui/interface.c gui/interface.h gui/win32/interface.c libvo/video_out.c libvo/vo_dxr3.c libvo/vo_xover.c |
| diffstat | 6 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/interface.c Mon Jun 27 13:56:19 2011 +0000 +++ b/gui/interface.c Mon Jun 27 14:04:13 2011 +0000 @@ -615,7 +615,7 @@ guiInfo.afilter = arg; break; - case guiSetVideo: + case guiSetVideoWindow: if (!guiApp.subWindow.isFullScreen) { wsResizeWindow(&guiApp.subWindow, vo_dwidth, vo_dheight);
--- a/gui/interface.h Mon Jun 27 13:56:19 2011 +0000 +++ b/gui/interface.h Mon Jun 27 14:04:13 2011 +0000 @@ -43,7 +43,7 @@ #define guiSetFileName 4 #define guiSetAudioOnly 6 #define guiReDrawSubWindow 7 -#define guiSetVideo 8 +#define guiSetVideoWindow 8 #define guiSetStream 9 #define guiReDraw 10 #define guiSetVolume 11
--- a/gui/win32/interface.c Mon Jun 27 13:56:19 2011 +0000 +++ b/gui/win32/interface.c Mon Jun 27 14:04:13 2011 +0000 @@ -614,7 +614,7 @@ } break; } - case guiSetVideo: + case guiSetVideoWindow: { guiInfo.MovieWidth = vo_dwidth; guiInfo.MovieHeight = vo_dheight;
--- a/libvo/video_out.c Mon Jun 27 13:56:19 2011 +0000 +++ b/libvo/video_out.c Mon Jun 27 14:04:13 2011 +0000 @@ -372,7 +372,7 @@ #ifdef CONFIG_GUI if (use_gui) { // GUI creates and manages window for us - guiGetEvent(guiSetVideo, 0); + guiGetEvent(guiSetVideoWindow, 0); } #endif }
--- a/libvo/vo_dxr3.c Mon Jun 27 13:56:19 2011 +0000 +++ b/libvo/vo_dxr3.c Mon Jun 27 14:04:13 2011 +0000 @@ -491,7 +491,7 @@ vo_dheight = d_height; #ifdef CONFIG_GUI if (use_gui) - guiGetEvent(guiSetVideo, 0); + guiGetEvent(guiSetVideoWindow, 0); #endif XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs); depth = xwin_attribs.depth;
--- a/libvo/vo_xover.c Mon Jun 27 13:56:19 2011 +0000 +++ b/libvo/vo_xover.c Mon Jun 27 14:04:13 2011 +0000 @@ -269,7 +269,7 @@ vo_dwidth=d_width; vo_dheight=d_height; #ifdef CONFIG_GUI - if(use_gui) guiGetEvent( guiSetVideo,0 ); // the GUI will set up / resize the window + if(use_gui) guiGetEvent( guiSetVideoWindow,0 ); // the GUI will set up / resize the window else { #endif