[MPlayer-cvslog] r36968 - in trunk: gui/win32/preferences.c help/help_mp-de.h help/help_mp-en.h libvo/vo_direct3d.c libvo/vo_directx.c

[ib]

Author: ib
Date: Sun Mar  2 22:10:13 2014
New Revision: 36968

Log:
Add VOCTRL_GUISUPPORT.

Both video output drivers support it.

Additionally, update MSGTR_GUI_WIN32_DisplayInVideoWindow.

Modified:
   trunk/gui/win32/preferences.c
   trunk/libvo/vo_direct3d.c
   trunk/libvo/vo_directx.c

Changes in other areas also in this revision:
Modified:
   trunk/help/help_mp-de.h
   trunk/help/help_mp-en.h

Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c	Sun Mar  2 22:06:26 2014	(r36967)
+++ trunk/gui/win32/preferences.c	Sun Mar  2 22:10:13 2014	(r36968)
@@ -235,7 +235,7 @@ static LRESULT CALLBACK PrefsWndProc(HWN
 
             btn = CreateWindow("button", acp(MSGTR_GUI_WIN32_DisplayInVideoWindow),
                                WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
-                               10, 249, 250, 25,
+                               10, 249, 300, 25,
                                hwnd, (HMENU) ID_VIDEOWINDOW,
                                ((LPCREATESTRUCT) lParam) -> hInstance,
                                NULL);

Modified: trunk/libvo/vo_direct3d.c
==============================================================================
--- trunk/libvo/vo_direct3d.c	Sun Mar  2 22:06:26 2014	(r36967)
+++ trunk/libvo/vo_direct3d.c	Sun Mar  2 22:10:13 2014	(r36968)
@@ -788,6 +788,8 @@ static int control(uint32_t request, voi
     case VOCTRL_RESUME:
         priv->is_paused = 0;
         return VO_TRUE;
+    case VOCTRL_GUISUPPORT:
+        return VO_TRUE;
     case VOCTRL_ONTOP:
         vo_w32_ontop();
         return VO_TRUE;

Modified: trunk/libvo/vo_directx.c
==============================================================================
--- trunk/libvo/vo_directx.c	Sun Mar  2 22:06:26 2014	(r36967)
+++ trunk/libvo/vo_directx.c	Sun Mar  2 22:10:13 2014	(r36968)
@@ -1137,6 +1137,8 @@ static int control(uint32_t request, voi
         vo_w32_fullscreen();
         Directx_ManageDisplay();
         return VO_TRUE;
+    case VOCTRL_GUISUPPORT:
+        return VO_TRUE;
     case VOCTRL_GET_PANSCAN:
         return VO_TRUE;
     case VOCTRL_SET_PANSCAN: