diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 14:05:47 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-08 14:05:47 +0000 |
| commit | 6a77e34f9427d77a7108ed1d307ce64472b9be3a (patch) | |
| tree | 75ce576e5c19e0d41360cb4b718a8ccd6a0ffd50 /Gui | |
| parent | 34c173873cbcd5cf4d8bfa89e028d36c162aa047 (diff) | |
| download | mpv-6a77e34f9427d77a7108ed1d307ce64472b9be3a.tar.bz2 mpv-6a77e34f9427d77a7108ed1d307ce64472b9be3a.tar.xz | |
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
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/win32/interface.c | 8 | ||||
| -rw-r--r-- | Gui/win32/preferences.c | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/Gui/win32/interface.c b/Gui/win32/interface.c index 99c4453fdf..02b944301a 100644 --- a/Gui/win32/interface.c +++ b/Gui/win32/interface.c @@ -690,7 +690,7 @@ int guiGetEvent(int type, char *arg) 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 @@ static int update_subwindow(void) 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 diff --git a/Gui/win32/preferences.c b/Gui/win32/preferences.c index c31a02aaae..83711a0135 100644 --- a/Gui/win32/preferences.c +++ b/Gui/win32/preferences.c @@ -213,7 +213,7 @@ static LRESULT CALLBACK PrefsWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM 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, |