Skip to content

V
vlc-1.1
Commit 7235303a authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Cosmetics.

parent 3540bb57
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 15 deletions
modules/video_output/msw/events.c
View file @ 7235303a
...@@ -1345,29 +1345,29 @@ int CreateEventThread( vout_thread_t *p_vout ) ...@@ -1345,29 +1345,29 @@ int CreateEventThread( vout_thread_t *p_vout )
* window (because PeekMessage has to be called from the same thread which * window (because PeekMessage has to be called from the same thread which
* created the window). */ * created the window). */
msg_Dbg( p_vout, "creating Vout EventThread" ); msg_Dbg( p_vout, "creating Vout EventThread" );
p_vout->p_sys->p_event = event_thread_t *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_event->p_vout = p_vout;
p_vout->p_sys->p_event->window_ready = CreateEvent( NULL, TRUE, FALSE, NULL ); 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_event, "Vout Events Thread",
EventThread, 0 ) ) EventThread, 0 ) )
{ {
msg_Err( p_vout, "cannot create Vout EventThread" ); msg_Err( p_vout, "cannot create Vout EventThread" );
CloseHandle( p_vout->p_sys->p_event->window_ready ); CloseHandle( p_event->window_ready );
vlc_object_release( p_vout->p_sys->p_event ); vlc_object_release( p_event );
p_vout->p_sys->p_event = NULL; p_event = NULL;
return 0; return 0;
} }
WaitForSingleObject( p_vout->p_sys->p_event->window_ready, INFINITE ); WaitForSingleObject( p_event->window_ready, INFINITE );
CloseHandle( p_vout->p_sys->p_event->window_ready ); CloseHandle( p_event->window_ready );
if( p_vout->p_sys->p_event->b_error ) if( p_event->b_error )
{ {
msg_Err( p_vout, "Vout EventThread failed" ); msg_Err( p_vout, "Vout EventThread failed" );
return 0; return 0;
} }
vlc_object_attach( p_vout->p_sys->p_event, p_vout ); vlc_object_attach( p_event, p_vout );
msg_Dbg( p_vout, "Vout EventThread running" ); msg_Dbg( p_vout, "Vout EventThread running" );
return 1; return 1;
...@@ -1385,10 +1385,11 @@ void StopEventThread( vout_thread_t *p_vout ) ...@@ -1385,10 +1385,11 @@ void StopEventThread( vout_thread_t *p_vout )
if( p_vout->p_sys->p_event ) if( p_vout->p_sys->p_event )
{ {
vlc_object_detach( p_vout->p_sys->p_event ); event_thread_t *p_event = p_vout->p_sys->p_event;
vlc_object_detach( p_event );
/* Kill Vout EventThread */ /* Kill Vout EventThread */
vlc_object_kill( p_vout->p_sys->p_event ); vlc_object_kill( p_event );
/* we need to be sure Vout EventThread won't stay stuck in /* we need to be sure Vout EventThread won't stay stuck in
* GetMessage, so we send a fake message */ * GetMessage, so we send a fake message */
...@@ -1397,10 +1398,11 @@ void StopEventThread( vout_thread_t *p_vout ) ...@@ -1397,10 +1398,11 @@ void StopEventThread( vout_thread_t *p_vout )
PostMessage( p_vout->p_sys->hwnd, WM_NULL, 0, 0); PostMessage( p_vout->p_sys->hwnd, WM_NULL, 0, 0);
} }
vlc_thread_join( p_vout->p_sys->p_event ); vlc_thread_join( p_event );
vlc_object_release( p_vout->p_sys->p_event ); vlc_object_release( p_event );
} }
if( !( p_vout->p_sys->i_changes & SWITCHING_MODE_FLAG ) ) if( !( p_vout->p_sys->i_changes & SWITCHING_MODE_FLAG ) )
vlc_mutex_destroy( &p_vout->p_sys->lock ); vlc_mutex_destroy( &p_vout->p_sys->lock );
} }
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