[Mplayer-cvslog] CVS: main/libvo vo_directx.c,1.12,1.13

[Sascha Sommer CVS]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv10839/libvo

Modified Files:
	vo_directx.c 
Log Message:
fix fullscreenswitching patch by Joey Parrish <joey at nicewarrior.org>

Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_directx.c	9 Feb 2003 20:18:23 -0000	1.12
+++ vo_directx.c	23 Feb 2003 19:18:28 -0000	1.13
@@ -811,15 +811,15 @@
     WNDCLASS   wc;
 	if(arg)
 	{
-		if(!strcmp(arg,"noaccel"))
+		if(strstr(arg,"noaccel"))
 		{
 			mp_msg(MSGT_VO,MSGL_V,"<vo_directx><INFO>disabled overlay\n");
 		    nooverlay = 1;
 		}
-        else
+		if(strstr(arg,"ontop"))
 		{
-			mp_msg(MSGT_VO,MSGL_ERR,"<vo_directx><ERROR>unknown subdevice: %s\n",arg);
-	        return ENOSYS;
+			mp_msg(MSGT_VO,MSGL_V,"<vo_directx><INFO>window ontop\n");
+			ontop = 1;
 		}
 	}
 	if (Directx_InitDirectDraw()!= 0)return 1;          //init DirectDraw
@@ -1158,7 +1158,7 @@
 		            SetWindowPlacement(hWnd,&window_placement);
 		            /*change style and restore the window*/ 
 					SetWindowLong(hWnd,GWL_STYLE,WS_OVERLAPPEDWINDOW|WS_SIZEBOX);
-					window_placement.showCmd = SW_SHOWNORMAL;		   
+					window_placement.showCmd = SW_RESTORE;
 		    		SetWindowPlacement(hWnd,&window_placement );
         			/*restore backgroundcolor*/
 		    		SetClassLongA(hWnd,GCL_HBRBACKGROUND,(int)CreateSolidBrush(windowcolor));