Commit 70630f32 authored by Gildas Bazin's avatar Gildas Bazin

* plugins/directx/vout_directx.*: the directx vout plugin now uses the
IID_IDirectDrawSurface2 interface, this shouldn't break anything and we should now
support WinNT4+DirectX3.
Added support for YUY2 overlays because a few graphics cards only support this.
Some code cleanup too.
* plugins/directx/vout_events.c: small bugfix.
parent 74b9c004
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_directx.h: Windows DirectX video output header file * vout_directx.h: Windows DirectX video output header file
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_directx.h,v 1.6 2002/05/18 13:30:28 gbazin Exp $ * $Id: vout_directx.h,v 1.6.2.1 2002/07/29 16:22:14 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -31,8 +31,8 @@ typedef struct vout_sys_s ...@@ -31,8 +31,8 @@ typedef struct vout_sys_s
{ {
LPDIRECTDRAW2 p_ddobject; /* DirectDraw object */ LPDIRECTDRAW2 p_ddobject; /* DirectDraw object */
LPDIRECTDRAWSURFACE3 p_display; /* Display device */ LPDIRECTDRAWSURFACE2 p_display; /* Display device */
LPDIRECTDRAWSURFACE3 p_current_surface; /* surface currently displayed */ LPDIRECTDRAWSURFACE2 p_current_surface; /* surface currently displayed */
LPDIRECTDRAWCLIPPER p_clipper; /* clipper used for blitting */ LPDIRECTDRAWCLIPPER p_clipper; /* clipper used for blitting */
HINSTANCE hddraw_dll; /* handle of the opened ddraw dll */ HINSTANCE hddraw_dll; /* handle of the opened ddraw dll */
HBRUSH hbrush; /* window backgound brush (color) */ HBRUSH hbrush; /* window backgound brush (color) */
...@@ -87,9 +87,9 @@ typedef struct vout_sys_s ...@@ -87,9 +87,9 @@ typedef struct vout_sys_s
*****************************************************************************/ *****************************************************************************/
typedef struct picture_sys_s typedef struct picture_sys_s
{ {
LPDIRECTDRAWSURFACE3 p_surface; LPDIRECTDRAWSURFACE2 p_surface;
DDSURFACEDESC ddsd; DDSURFACEDESC ddsd;
LPDIRECTDRAWSURFACE3 p_front_surface; LPDIRECTDRAWSURFACE2 p_front_surface;
} picture_sys_t; } picture_sys_t;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vout_events.c: Windows DirectX video output events handler * vout_events.c: Windows DirectX video output events handler
***************************************************************************** *****************************************************************************
* Copyright (C) 2001 VideoLAN * Copyright (C) 2001 VideoLAN
* $Id: vout_events.c,v 1.18.2.2 2002/06/03 17:19:54 sam Exp $ * $Id: vout_events.c,v 1.18.2.3 2002/07/29 16:22:14 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -285,7 +285,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout ) ...@@ -285,7 +285,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
p_vout->p_sys->rect_display.bottom, p_vout->p_sys->rect_display.bottom,
p_vout->p_sys->i_display_depth ); p_vout->p_sys->i_display_depth );
ReleaseDC( p_vout->p_sys->hwnd, hdc ); ReleaseDC( NULL, hdc );
/* Get the Icon from the main app */ /* Get the Icon from the main app */
vlc_icon = NULL; vlc_icon = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment