[MPlayer-cvslog] CVS: main/libvo vo_directx.c,1.47,1.48

[Sascha Sommer CVS]

CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv23920/libvo

Modified Files:
	vo_directx.c 
Log Message:
win95 fix fix by Rune Petersen <rune.mail-list at mail.tele.dk>

Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- vo_directx.c	27 Dec 2004 19:27:07 -0000	1.47
+++ vo_directx.c	2 Jan 2005 16:44:44 -0000	1.48
@@ -380,13 +380,10 @@
             selected_guid_ptr = &selected_guid;
         }
         mi.cbSize = sizeof(mi);
-        if(myGetMonitorInfo){
+
         if (myGetMonitorInfo(hm, &mi)) {
 			monitor_rect = mi.rcMonitor;
         }
-        }else{
-            mp_msg(MSGT_VO, MSGL_ERR, "-adapter is not supported on Win95\n");
-        }
         mp_msg(MSGT_VO, MSGL_INFO ,"\t\t<--");
     }
     mp_msg(MSGT_VO, MSGL_INFO ,"\n");
@@ -405,7 +402,11 @@
 	HINSTANCE user32dll=LoadLibrary("user32.dll");
 	
 	if(user32dll){
-		myGetMonitorInfo=GetProcAddress(user32dll,"GetMonitorInfo");
+		myGetMonitorInfo=GetProcAddress(user32dll,"GetMonitorInfoA");
+		if(!myGetMonitorInfo && vo_adapter_num){
+			mp_msg(MSGT_VO, MSGL_ERR, "<vo_directx> -adapter is not supported on Win95\n");
+			vo_adapter_num = 0;
+		}
 	}
 	
 	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>Initing DirectDraw\n" );