[MPlayer-cvslog] r33741 - in trunk: gui/interface.c gui/interface.h gui/win32/interface.c libvo/video_out.c libvo/vo_dxr3.c libvo/vo_xover.c

[ib]

Author: ib
Date: Mon Jun 27 16:04:13 2011
New Revision: 33741

Log:
Rename guiGetEvent type guiSetVideo guiSetVideoWindow.

Modified:
   trunk/gui/interface.c
   trunk/gui/interface.h
   trunk/gui/win32/interface.c
   trunk/libvo/video_out.c
   trunk/libvo/vo_dxr3.c
   trunk/libvo/vo_xover.c

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/gui/interface.c	Mon Jun 27 16:04:13 2011	(r33741)
@@ -615,7 +615,7 @@ int guiGetEvent(int type, void *arg)
         guiInfo.afilter = arg;
         break;
 
-    case guiSetVideo:
+    case guiSetVideoWindow:
 
         if (!guiApp.subWindow.isFullScreen) {
             wsResizeWindow(&guiApp.subWindow, vo_dwidth, vo_dheight);

Modified: trunk/gui/interface.h
==============================================================================
--- trunk/gui/interface.h	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/gui/interface.h	Mon Jun 27 16:04:13 2011	(r33741)
@@ -43,7 +43,7 @@ extern int use_gui;             // this 
 #define guiSetFileName     4
 #define guiSetAudioOnly    6
 #define guiReDrawSubWindow 7
-#define guiSetVideo        8
+#define guiSetVideoWindow  8
 #define guiSetStream       9
 #define guiReDraw          10
 #define guiSetVolume       11

Modified: trunk/gui/win32/interface.c
==============================================================================
--- trunk/gui/win32/interface.c	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/gui/win32/interface.c	Mon Jun 27 16:04:13 2011	(r33741)
@@ -614,7 +614,7 @@ int guiGetEvent(int type, void *arg)
             }
             break;
         }
-        case guiSetVideo:
+        case guiSetVideoWindow:
         {
             guiInfo.MovieWidth = vo_dwidth;
             guiInfo.MovieHeight = vo_dheight;

Modified: trunk/libvo/video_out.c
==============================================================================
--- trunk/libvo/video_out.c	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/libvo/video_out.c	Mon Jun 27 16:04:13 2011	(r33741)
@@ -372,7 +372,7 @@ int config_video_out(const vo_functions_
 #ifdef CONFIG_GUI
     if (use_gui) {
       // GUI creates and manages window for us
-      guiGetEvent(guiSetVideo, 0);
+      guiGetEvent(guiSetVideoWindow, 0);
     }
 #endif
   }

Modified: trunk/libvo/vo_dxr3.c
==============================================================================
--- trunk/libvo/vo_dxr3.c	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/libvo/vo_dxr3.c	Mon Jun 27 16:04:13 2011	(r33741)
@@ -491,7 +491,7 @@ static int config(uint32_t width, uint32
 		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;

Modified: trunk/libvo/vo_xover.c
==============================================================================
--- trunk/libvo/vo_xover.c	Mon Jun 27 15:56:19 2011	(r33740)
+++ trunk/libvo/vo_xover.c	Mon Jun 27 16:04:13 2011	(r33741)
@@ -269,7 +269,7 @@ static int config(uint32_t width, uint32
   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