Skip to content

V
vlc-2-2
Commit 0ed8e60e authored by Jean-Marc Dressler's avatar Jean-Marc Dressler Committed by Rémi Denis-Courmont
Browse files
Options

Fix several compilation bugs in msw vout 

Signed-off-by: default avatarRémi Denis-Courmont <rdenis@simphalempin.com>
parent 2eb8e7dc
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 16 deletions
modules/video_output/msw/direct3d.c
View file @ 0ed8e60e
...@@ -203,18 +203,18 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -203,18 +203,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event = p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) ); 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->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", if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) ) EventThread, 0, false ) )
{ {
msg_Err( p_vout, "cannot create Vout EventThread" ); 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 ); vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL; p_vout->p_sys->p_event = NULL;
goto error; goto error;
} }
WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE ) WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
CloseHandle( p_vout->p_sys->p_event->ready ); CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error ) if( p_vout->p_sys->p_event->b_error )
{ {
......
modules/video_output/msw/directx.c
View file @ 0ed8e60e
...@@ -277,18 +277,18 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -277,18 +277,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event = p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) ); 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->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", if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) ) EventThread, 0, false ) )
{ {
msg_Err( p_vout, "cannot create Vout EventThread" ); 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 ); vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL; p_vout->p_sys->p_event = NULL;
goto error; goto error;
} }
WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE ) WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
CloseHandle( p_vout->p_sys->p_event->ready ); CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error ) if( p_vout->p_sys->p_event->b_error )
{ {
......
modules/video_output/msw/glwin32.c
View file @ 0ed8e60e
...@@ -134,18 +134,18 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -134,18 +134,18 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys->p_event = p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) ); 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->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", if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) ) EventThread, 0, false ) )
{ {
msg_Err( p_vout, "cannot create Vout EventThread" ); 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 ); vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL; p_vout->p_sys->p_event = NULL;
goto error; goto error;
} }
WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE ) WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
CloseHandle( p_vout->p_sys->p_event->ready ); CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error ) if( p_vout->p_sys->p_event->b_error )
{ {
......
modules/video_output/msw/wingdi.c
View file @ 0ed8e60e
...@@ -242,18 +242,18 @@ static int OpenVideo ( vlc_object_t *p_this ) ...@@ -242,18 +242,18 @@ static int OpenVideo ( vlc_object_t *p_this )
p_vout->p_sys->p_event = p_vout->p_sys->p_event =
vlc_object_create( p_vout, sizeof(event_thread_t) ); 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->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", if( vlc_thread_create( p_vout->p_sys->p_event, "Vout Events Thread",
EventThread, 0, false ) ) EventThread, 0, false ) )
{ {
msg_Err( p_vout, "cannot create Vout EventThread" ); 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 ); vlc_object_release( p_vout->p_sys->p_event );
p_vout->p_sys->p_event = NULL; p_vout->p_sys->p_event = NULL;
goto error; goto error;
} }
WaitForSingleObject( p_vout->p_sys->p_event->ready, INFINITE ) WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE );
CloseHandle( p_vout->p_sys->p_event->ready ); CloseHandle( p_vout->p_sys->p_event->window_ready );
if( p_vout->p_sys->p_event->b_error ) if( p_vout->p_sys->p_event->b_error )
{ {
......
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