[MPlayer-cvslog] r18952 - in trunk/Gui/win32: interface.c preferences.c

[reimar]

Author: reimar
Date: Sat Jul  8 16:05:47 2006
New Revision: 18952

Modified:
   trunk/Gui/win32/interface.c
   trunk/Gui/win32/preferences.c

Log:
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.


Modified: trunk/Gui/win32/interface.c
==============================================================================
--- trunk/Gui/win32/interface.c	(original)
+++ trunk/Gui/win32/interface.c	Sat Jul  8 16:05:47 2006
@@ -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
 

Modified: trunk/Gui/win32/preferences.c
==============================================================================
--- trunk/Gui/win32/preferences.c	(original)
+++ trunk/Gui/win32/preferences.c	Sat Jul  8 16:05:47 2006
@@ -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,