Mercurial > mplayer.hg
changeset 18947:06ab2099c10e
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.
| author | reimar |
|---|---|
| date | Sat, 08 Jul 2006 14:05:47 +0000 |
| parents | 35754d685781 |
| children | c2aee29c80b6 |
| files | Gui/win32/interface.c Gui/win32/preferences.c |
| diffstat | 2 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Gui/win32/interface.c Sat Jul 08 14:00:37 2006 +0000 +++ b/Gui/win32/interface.c Sat Jul 08 14:05:47 2006 +0000 @@ -690,7 +690,7 @@ video_out->control(VOCTRL_FULLSCREEN, 0); /* no WinID, keep the sub window hidden */ - if((video_driver_list && !strstr(video_driver_list[0], "directx")) || !sub_window) + if(!sub_window) break; if(vo_fs) @@ -904,11 +904,7 @@ RECT rd; WINDOWPOS wp; - /* it's not the best way to check if selected driver is directx, - 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) + if(!sub_window) { WinID = -1; // so far only directx supports WinID in windows
--- a/Gui/win32/preferences.c Sat Jul 08 14:00:37 2006 +0000 +++ b/Gui/win32/preferences.c Sat Jul 08 14:05:47 2006 +0000 @@ -213,7 +213,7 @@ NULL); 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, 55, 227, 250, 25, hwnd, (HMENU) ID_SUBWINDOW,