[Mplayer-cvslog] CVS: main/libvo vo_directx.c,1.9,1.10

[Arpi]

Hi,

ARGH^&#%^&@DKLHDjkgs

STOP commiting this shti NOW.

> Update of /cvsroot/mplayer/main/libvo
> In directory mail:/var/tmp.root/cvs-serv6303/libvo
> 
> Modified Files:
> 	vo_directx.c 
> Log Message:
> Those pesky ^M DOS characters removed...
> 
> 
> Index: vo_directx.c
> ===================================================================
> RCS file: /cvsroot/mplayer/main/libvo/vo_directx.c,v
> retrieving revision 1.9
> retrieving revision 1.10
> diff -u -r1.9 -r1.10
> --- vo_directx.c	21 Dec 2002 23:49:33 -0000	1.9
> +++ vo_directx.c	30 Dec 2002 20:41:58 -0000	1.10
> @@ -37,7 +37,7 @@
>  #include "fastmemcpy.h"
>  #include "../input/input.h"
>  #include "../linux/keycodes.h"
> -#include "../mp_msg.h"
> +#include "../mp_msg.h"
>  #include "aspect.h"
>  
>  static LPDIRECTDRAW2        g_lpdd = NULL;          //DirectDraw Object
> @@ -46,7 +46,7 @@
>  static LPDIRECTDRAWSURFACE  g_lpddsBack = NULL;     //Back surface
>  static LPDIRECTDRAWCLIPPER  g_lpddclipper;          //clipper object, can only be used without overlay
>  static DDSURFACEDESC		ddsdsf;                 //surface descripiton needed for locking
> -static HINSTANCE            hddraw_dll;             //handle to ddraw.dll
> +static HINSTANCE            hddraw_dll;             //handle to ddraw.dll
>  static RECT                 rd;                     //rect of our stretched image
>  static RECT                 rs;                     //rect of our source image
>  static HWND                 hWnd=NULL;              //handle to the window
> @@ -324,9 +324,9 @@
>  	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>window destroyed\n");
>  	if (g_lpdd != NULL) g_lpdd->lpVtbl->Release(g_lpdd);
>  	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>directdrawobject released\n");
> -	FreeLibrary( hddraw_dll);
> -	hddraw_dll= NULL;
> -	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>ddraw.dll freed\n");
> +	FreeLibrary( hddraw_dll);
> +	hddraw_dll= NULL;
> +	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>ddraw.dll freed\n");
>  	mp_msg(MSGT_VO, MSGL_DBG3,"<vo_directx><INFO>uninited\n");    
>  }
>  
> @@ -395,12 +395,12 @@
>  	uint32_t        xscreen = GetSystemMetrics(SM_CXSCREEN);
>      uint32_t        yscreen = GetSystemMetrics(SM_CYSCREEN);
>  	RECT            rd_window;
> -	int32_t         width,height;
> +	int32_t         width,height;
>  	rd_window.top = 0;
>  	rd_window.left = 0;
>  	rd_window.right = xscreen;
>  	rd_window.bottom = yscreen;
> -	aspect(&width,&height,A_ZOOM);
> +	aspect(&width,&height,A_ZOOM);
>  	rd.left = (xscreen-width)/2;
>  	rd.right = rd.left+width;
>  	rd.top = (yscreen-height)/2;
> @@ -1022,7 +1022,7 @@
>  static void flip_page(void)
>  {
>     	HRESULT dxresult;
> -	g_lpddsBack->lpVtbl->Unlock (g_lpddsBack,NULL);
> +	g_lpddsBack->lpVtbl->Unlock (g_lpddsBack,NULL);
>  	if (vo_doublebuffering) 
>      {
>  		// flip to the next image in the sequence  
> @@ -1035,15 +1035,15 @@
>  		}
>  		if(dxresult != DD_OK)mp_msg(MSGT_VO, MSGL_ERR,"<vo_directx><ERROR>can't flip page\n");
>      }
> -	if(nooverlay) 
> -	{
> -		DDBLTFX  ddbltfx;
> -        // ask for the "NOTEARING" option
> -	    memset( &ddbltfx, 0, sizeof(DDBLTFX) );
> -        ddbltfx.dwSize = sizeof(DDBLTFX);
> -        ddbltfx.dwDDFX = DDBLTFX_NOTEARING;
> -        g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx);
> -    }	
> +	if(nooverlay) 
> +	{
> +		DDBLTFX  ddbltfx;
> +        // ask for the "NOTEARING" option
> +	    memset( &ddbltfx, 0, sizeof(DDBLTFX) );
> +        ddbltfx.dwSize = sizeof(DDBLTFX);
> +        ddbltfx.dwDDFX = DDBLTFX_NOTEARING;
> +        g_lpddsPrimary->lpVtbl->Blt(g_lpddsPrimary, &rd, g_lpddsBack, NULL, DDBLT_WAIT, &ddbltfx);
> +    }	
>  	g_lpddsBack->lpVtbl->Lock(g_lpddsBack,NULL,&ddsdsf, DDLOCK_NOSYSLOCK | DDLOCK_WAIT , NULL);
>  	dstride = ddsdsf.lPitch;
>      image = ddsdsf.lpSurface;
> @@ -1162,13 +1162,13 @@
>  	if(vm)fs=1;
>  	image_format =  format;
>  	image_width = width;
> -	image_height = height;
> -	d_image_width = d_width;
> -	d_image_height = d_height;
> -    aspect_save_orig(image_width,image_height);
> -    aspect_save_prescale(d_image_width,d_image_height);
> -    aspect_save_screenres(GetSystemMetrics(SM_CXSCREEN),GetSystemMetrics(SM_CYSCREEN));
> -	aspect(&d_image_width,&d_image_height,A_NOZOOM);
> +	image_height = height;
> +	d_image_width = d_width;
> +	d_image_height = d_height;
> +    aspect_save_orig(image_width,image_height);
> +    aspect_save_prescale(d_image_width,d_image_height);
> +    aspect_save_screenres(GetSystemMetrics(SM_CXSCREEN),GetSystemMetrics(SM_CYSCREEN));
> +	aspect(&d_image_width,&d_image_height,A_NOZOOM);
>  	SetWindowText(hWnd,"");
>  	if (g_lpddsBack != NULL) g_lpddsBack->lpVtbl->Release(g_lpddsBack);
>  	g_lpddsBack = NULL;
> 
> _______________________________________________
> Mplayer-cvslog mailing list
> Mplayer-cvslog at mplayerhq.hu
> http://mplayerhq.hu/mailman/listinfo/mplayer-cvslog
> 
> 


A'rpi / Astral & ESP-team

--
Developer of MPlayer, the Movie Player for Linux - http://www.MPlayerHQ.hu