[Mplayer-cvslog] CVS: 0_90/libvo vo_directx.c,1.11,1.12

[Arpi of Ize]

Update of /cvsroot/mplayer/0_90/libvo
In directory mail:/var/tmp.root/cvs-serv15213

Modified Files:
	vo_directx.c 
Log Message:
backport: 'ontop' support, SW_SHOWNORMAL->SW_RESTORE


Index: vo_directx.c
===================================================================
RCS file: /cvsroot/mplayer/0_90/libvo/vo_directx.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- vo_directx.c	30 Dec 2002 23:31:40 -0000	1.11
+++ vo_directx.c	10 Mar 2003 15:58:17 -0000	1.12
@@ -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));