mirror of
https://github.com/mpv-player/mpv
synced 2024-10-18 10:25:02 +02:00
OpenGL outputs actually support WinID, not to mention that showing the option
but just ignoring the setting is a very ugly and confusing way to handle it. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18952 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
34c173873c
commit
6a77e34f94
@ -690,7 +690,7 @@ int guiGetEvent(int type, char *arg)
|
|||||||
video_out->control(VOCTRL_FULLSCREEN, 0);
|
video_out->control(VOCTRL_FULLSCREEN, 0);
|
||||||
|
|
||||||
/* no WinID, keep the sub window hidden */
|
/* no WinID, keep the sub window hidden */
|
||||||
if((video_driver_list && !strstr(video_driver_list[0], "directx")) || !sub_window)
|
if(!sub_window)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
if(vo_fs)
|
if(vo_fs)
|
||||||
@ -904,11 +904,7 @@ static int update_subwindow(void)
|
|||||||
RECT rd;
|
RECT rd;
|
||||||
WINDOWPOS wp;
|
WINDOWPOS wp;
|
||||||
|
|
||||||
/* it's not the best way to check if selected driver is directx,
|
if(!sub_window)
|
||||||
if no driver is specified video_driver_list is null.
|
|
||||||
Right now I don't have a functional way to do this
|
|
||||||
- Sherpya */
|
|
||||||
if((video_driver_list && !strstr(video_driver_list[0], "directx")) || !sub_window)
|
|
||||||
{
|
{
|
||||||
WinID = -1; // so far only directx supports WinID in windows
|
WinID = -1; // so far only directx supports WinID in windows
|
||||||
|
|
||||||
|
@ -213,7 +213,7 @@ static LRESULT CALLBACK PrefsWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM
|
|||||||
NULL);
|
NULL);
|
||||||
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
|
SendMessage(btn, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0);
|
||||||
|
|
||||||
btn = CreateWindow("button", "Display videos in the sub window (directx only)",
|
btn = CreateWindow("button", "Display videos in the sub window",
|
||||||
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
|
WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
|
||||||
55, 227, 250, 25,
|
55, 227, 250, 25,
|
||||||
hwnd, (HMENU) ID_SUBWINDOW,
|
hwnd, (HMENU) ID_SUBWINDOW,
|
||||||
|
Loading…
Reference in New Issue
Block a user