Skip to content

V
vlc-1.1
Commit d6052740 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* 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.
Some code cleanup too.
* plugins/directx/vout_events.c: small bugfix.
parent 7152ccea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 161 deletions
plugins/directx/vout_directx.c
View file @ d6052740
This diff is collapsed.
plugins/directx/vout_directx.h
View file @ d6052740
......@@ -2,7 +2,7 @@
* vout_directx.h: Windows DirectX video output header file
*****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN
* $Id: vout_directx.h,v 1.9 2002/07/20 18:01:42 sam Exp $
* $Id: vout_directx.h,v 1.10 2002/07/29 19:07:00 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -41,8 +41,8 @@ typedef struct event_thread_t
struct vout_sys_t
{
LPDIRECTDRAW2 p_ddobject; /* DirectDraw object */
LPDIRECTDRAWSURFACE3 p_display; /* Display device */
LPDIRECTDRAWSURFACE3 p_current_surface; /* surface currently displayed */
LPDIRECTDRAWSURFACE2 p_display; /* Display device */
LPDIRECTDRAWSURFACE2 p_current_surface; /* surface currently displayed */
LPDIRECTDRAWCLIPPER p_clipper; /* clipper used for blitting */
HINSTANCE hddraw_dll; /* handle of the opened ddraw dll */
HBRUSH hbrush; /* window backgound brush (color) */
......@@ -94,9 +94,9 @@ struct vout_sys_t
*****************************************************************************/
struct picture_sys_t
{
LPDIRECTDRAWSURFACE3 p_surface;
LPDIRECTDRAWSURFACE2 p_surface;
DDSURFACEDESC ddsd;
LPDIRECTDRAWSURFACE3 p_front_surface;
LPDIRECTDRAWSURFACE2 p_front_surface;
};
/*****************************************************************************
......
plugins/directx/vout_events.c
View file @ d6052740
......@@ -2,7 +2,7 @@
* vout_events.c: Windows DirectX video output events handler
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: vout_events.c,v 1.23 2002/06/04 00:11:12 sam Exp $
* $Id: vout_events.c,v 1.24 2002/07/29 19:07:00 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -285,7 +285,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
p_vout->p_sys->rect_display.bottom,
p_vout->p_sys->i_display_depth );
ReleaseDC( p_vout->p_sys->hwnd, hdc );
ReleaseDC( NULL, hdc );
/* Get the Icon from the main app */
vlc_icon = NULL;
......@@ -344,7 +344,7 @@ static int DirectXCreateWindow( vout_thread_t *p_vout )
/* create the window */
p_vout->p_sys->hwnd = CreateWindow("VLC DirectX",/* name of window class */
"VLC DirectX", /* window title bar text */
VOUT_TITLE " (DirectX Output)", /* window title bar text */
WS_OVERLAPPEDWINDOW
| WS_SIZEBOX, /* window style */
CW_USEDEFAULT, /* default X coordinate */
......
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