Skip to content

V
vlc-gpu
Commit f9a7f0e8 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options 

* Fixed yet another bug related to the event thread creation
* Removed a few debug messages
parent f8cad0ac
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
plugins/directx/vout_directx.h
View file @ f9a7f0e8
...@@ -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.3 2002/01/27 22:14:52 gbazin Exp $ * $Id: vout_directx.h,v 1.4 2002/04/02 06:31:23 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -73,7 +73,7 @@ typedef struct vout_sys_s ...@@ -73,7 +73,7 @@ typedef struct vout_sys_s
vlc_mutex_t event_thread_lock; /* lock for the event thread */ vlc_mutex_t event_thread_lock; /* lock for the event thread */
vlc_cond_t event_thread_wait; vlc_cond_t event_thread_wait;
int i_event_thread_status; /* DirectXEventThread status */ volatile int i_event_thread_status; /* DirectXEventThread status */
boolean_t b_event_thread_die; /* flag to kill the event thread */ boolean_t b_event_thread_die; /* flag to kill the event thread */
} vout_sys_t; } vout_sys_t;
......
plugins/directx/vout_events.c
View file @ f9a7f0e8
...@@ -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.12 2002/04/01 16:08:23 gbazin Exp $ * $Id: vout_events.c,v 1.13 2002/04/02 06:31:23 gbazin Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -415,10 +415,12 @@ static void DirectXUpdateRects( vout_thread_t *p_vout ) ...@@ -415,10 +415,12 @@ static void DirectXUpdateRects( vout_thread_t *p_vout )
/* Clip the destination window */ /* Clip the destination window */
IntersectRect( &rect_dest_clipped, &rect_dest, &rect_display ); IntersectRect( &rect_dest_clipped, &rect_dest, &rect_display );
#if 0
intf_WarnMsg( 3, "vout: DirectXUpdateRects image_dst_clipped coords:" intf_WarnMsg( 3, "vout: DirectXUpdateRects image_dst_clipped coords:"
" %i,%i,%i,%i", " %i,%i,%i,%i",
rect_dest_clipped.left, rect_dest_clipped.top, rect_dest_clipped.left, rect_dest_clipped.top,
rect_dest_clipped.right, rect_dest_clipped.bottom); rect_dest_clipped.right, rect_dest_clipped.bottom);
#endif
/* the 2 following lines are to fix a bug when clicking on the desktop */ /* the 2 following lines are to fix a bug when clicking on the desktop */
if( (rect_dest_clipped.right - rect_dest_clipped.left)==0 || if( (rect_dest_clipped.right - rect_dest_clipped.left)==0 ||
...@@ -446,10 +448,12 @@ static void DirectXUpdateRects( vout_thread_t *p_vout ) ...@@ -446,10 +448,12 @@ static void DirectXUpdateRects( vout_thread_t *p_vout )
(rect_dest.bottom - rect_dest_clipped.bottom) * p_vout->render.i_height / (rect_dest.bottom - rect_dest_clipped.bottom) * p_vout->render.i_height /
(rect_dest.bottom - rect_dest.top); (rect_dest.bottom - rect_dest.top);
#if 0
intf_WarnMsg( 3, "vout: DirectXUpdateRects image_src_clipped" intf_WarnMsg( 3, "vout: DirectXUpdateRects image_src_clipped"
" coords: %i,%i,%i,%i", " coords: %i,%i,%i,%i",
rect_src_clipped.left, rect_src_clipped.top, rect_src_clipped.left, rect_src_clipped.top,
rect_src_clipped.right, rect_src_clipped.bottom); rect_src_clipped.right, rect_src_clipped.bottom);
#endif
#undef rect_src #undef rect_src
#undef rect_src_clipped #undef rect_src_clipped
...@@ -495,10 +499,12 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message, ...@@ -495,10 +499,12 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
GetClientRect( hwnd, &rect_window ); GetClientRect( hwnd, &rect_window );
p_vout->p_sys->i_window_width = rect_window.right; p_vout->p_sys->i_window_width = rect_window.right;
p_vout->p_sys->i_window_height = rect_window.bottom; p_vout->p_sys->i_window_height = rect_window.bottom;
#if 0
intf_WarnMsg( 3, "vout: WinProc WM_WINDOWPOSCHANGED %i,%i,%i,%i", intf_WarnMsg( 3, "vout: WinProc WM_WINDOWPOSCHANGED %i,%i,%i,%i",
p_vout->p_sys->i_window_x, p_vout->p_sys->i_window_y, p_vout->p_sys->i_window_x, p_vout->p_sys->i_window_y,
p_vout->p_sys->i_window_width, p_vout->p_sys->i_window_width,
p_vout->p_sys->i_window_height ); p_vout->p_sys->i_window_height );
#endif
DirectXUpdateRects( p_vout ); DirectXUpdateRects( p_vout );
if( p_vout->p_sys->b_using_overlay && if( p_vout->p_sys->b_using_overlay &&
......
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