Mercurial > mplayer.hg
changeset 36872:c0004493b01b
Add VOCTRL_GUISUPPORT.
Both video output drivers support it.
Additionally, update MSGTR_GUI_WIN32_DisplayInVideoWindow.
| author | ib |
|---|---|
| date | Sun, 02 Mar 2014 21:10:13 +0000 |
| parents | d0cc70892148 |
| children | 05efbb5ab47e |
| files | gui/win32/preferences.c help/help_mp-de.h help/help_mp-en.h libvo/vo_direct3d.c libvo/vo_directx.c |
| diffstat | 5 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/win32/preferences.c Sun Mar 02 21:06:26 2014 +0000 +++ b/gui/win32/preferences.c Sun Mar 02 21:10:13 2014 +0000 @@ -235,7 +235,7 @@ 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);
--- a/help/help_mp-de.h Sun Mar 02 21:06:26 2014 +0000 +++ b/help/help_mp-de.h Sun Mar 02 21:10:13 2014 +0000 @@ -1029,7 +1029,7 @@ #define MSGTR_GUI_WIN32_DebugConsole "Debugging-Konsole" #define MSGTR_GUI_WIN32_Defaults "Standard" #define MSGTR_GUI_WIN32_DirectoryList "Verzeichnisliste" -#define MSGTR_GUI_WIN32_DisplayInVideoWindow "Im Videofenster anzeigen (nur DirectX)" +#define MSGTR_GUI_WIN32_DisplayInVideoWindow "Im Videofenster anzeigen (nur DirectX oder Direct3D)" #define MSGTR_GUI_WIN32_Down "Runter" #define MSGTR_GUI_WIN32_Load "Laden" #define MSGTR_GUI_WIN32_OnlineHelp "Online-Hilfe"
--- a/help/help_mp-en.h Sun Mar 02 21:06:26 2014 +0000 +++ b/help/help_mp-en.h Sun Mar 02 21:10:13 2014 +0000 @@ -820,7 +820,7 @@ #define MSGTR_GUI_WIN32_DebugConsole "Debug Console" #define MSGTR_GUI_WIN32_Defaults "Defaults" #define MSGTR_GUI_WIN32_DirectoryList "Directory list" -#define MSGTR_GUI_WIN32_DisplayInVideoWindow "Display in the video window (DirectX only)" +#define MSGTR_GUI_WIN32_DisplayInVideoWindow "Display in the video window (DirectX or Direct3D only)" #define MSGTR_GUI_WIN32_Down "Down" #define MSGTR_GUI_WIN32_Load "Load" #define MSGTR_GUI_WIN32_OnlineHelp "Online Help"
--- a/libvo/vo_direct3d.c Sun Mar 02 21:06:26 2014 +0000 +++ b/libvo/vo_direct3d.c Sun Mar 02 21:10:13 2014 +0000 @@ -788,6 +788,8 @@ 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;
--- a/libvo/vo_directx.c Sun Mar 02 21:06:26 2014 +0000 +++ b/libvo/vo_directx.c Sun Mar 02 21:10:13 2014 +0000 @@ -1137,6 +1137,8 @@ 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: