[vlc-devel] commit: Fix several compilation bugs in msw vout (Jean-Marc Dressler )
git version control
git at videolan.org
Thu Jan 15 16:44:12 CET 2009
vlc | branch: master | Jean-Marc Dressler <jmd at objectik.com> | Thu Jan 15 16:01:30 2009 +0100| [0ed8e60ed29e534e6d9de339949a0a09f0d4ff58] | committer: Rémi Denis-Courmont
Fix several compilation bugs in msw vout
Signed-off-by: Rémi Denis-Courmont <rdenis at simphalempin.com>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0ed8e60ed29e534e6d9de339949a0a09f0d4ff58
---
modules/video_output/msw/direct3d.c | 8 ++++----
modules/video_output/msw/directx.c | 8 ++++----
modules/video_output/msw/glwin32.c | 8 ++++----
modules/video_output/msw/wingdi.c | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c
index 021323b..f41e413 100644
--- a/modules/video_output/msw/direct3d.c
+++ b/modules/video_output/msw/direct3d.c
@@ -203,18 +203,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) );
p_vout->p_sys->p_event->p_vout = p_vout;
- p_vout->p_sys->p_event->ready = CreateEvent( NULL, TRUE, FALSE, NULL );
+ p_vout->p_sys->p_event->window_ready = CreateEvent( NULL, TRUE, FALSE, NULL );
if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) )
{
msg_Err( p_vout, "cannot create Vout EventThread" );
- CloseHandle( p_vout->p_sys->p_event->ready );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL;
goto error;
}
- WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE )
- CloseHandle( p_vout->p_sys->p_event->ready );
+ WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error )
{
diff --git a/modules/video_output/msw/directx.c b/modules/video_output/msw/directx.c
index 217ffeb..006e87b 100644
--- a/modules/video_output/msw/directx.c
+++ b/modules/video_output/msw/directx.c
@@ -277,18 +277,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) );
p_vout->p_sys->p_event->p_vout = p_vout;
- p_vout->p_sys->p_event->ready = CreateEvent( NULL, TRUE, FALSE, NULL );
+ p_vout->p_sys->p_event->window_ready = CreateEvent( NULL, TRUE, FALSE, NULL );
if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) )
{
msg_Err( p_vout, "cannot create Vout EventThread" );
- CloseHandle( p_vout->p_sys->p_event->ready );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL;
goto error;
}
- WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE )
- CloseHandle( p_vout->p_sys->p_event->ready );
+ WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error )
{
diff --git a/modules/video_output/msw/glwin32.c b/modules/video_output/msw/glwin32.c
index 5729a27..af23169 100644
--- a/modules/video_output/msw/glwin32.c
+++ b/modules/video_output/msw/glwin32.c
@@ -134,18 +134,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) );
p_vout->p_sys->p_event->p_vout = p_vout;
- p_vout->p_sys->p_event->ready = CreateEvent( NULL, TRUE, FALSE, NULL );
+ p_vout->p_sys->p_event->window_ready = CreateEvent( NULL, TRUE, FALSE, NULL );
if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) )
{
msg_Err( p_vout, "cannot create Vout EventThread" );
- CloseHandle( p_vout->p_sys->p_event->ready );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL;
goto error;
}
- WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE )
- CloseHandle( p_vout->p_sys->p_event->ready );
+ WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error )
{
diff --git a/modules/video_output/msw/wingdi.c b/modules/video_output/msw/wingdi.c
index 190fd90..6047680 100644
--- a/modules/video_output/msw/wingdi.c
+++ b/modules/video_output/msw/wingdi.c
@@ -242,18 +242,18 @@ static int OpenVideo ( vlc_object_t *p_this )
p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) );
p_vout->p_sys->p_event->p_vout = p_vout;
- p_vout->p_sys->p_event->ready = CreateEvent( NULL, TRUE, FALSE, NULL );
+ p_vout->p_sys->p_event->window_ready = CreateEvent( NULL, TRUE, FALSE, NULL );
if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) )
{
msg_Err( p_vout, "cannot create Vout EventThread" );
- CloseHandle( p_vout->p_sys->p_event->ready );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL;
goto error;
}
- WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE )
- CloseHandle( p_vout->p_sys->p_event->ready );
+ WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
+ CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error )
{
More information about the vlc-devel
mailing list