Commit 0f7394a4 authored by Rémi Duraffort's avatar Rémi Duraffort

Fix threaded function declaration.

parent 8e8f3ca3
......@@ -92,8 +92,9 @@ static int DirectXConvertKey( int i_key );
* The main goal of this thread is to isolate the Win32 PeekMessage function
* because this one can block for a long time.
*****************************************************************************/
void EventThread( event_thread_t *p_event )
void* EventThread( vlc_object_t *p_this )
{
event_thread_t *p_event = (event_thread_t *)p_this;
MSG msg;
POINT old_mouse_pos = {0,0}, mouse_pos;
vlc_value_t val;
......@@ -375,6 +376,7 @@ void EventThread( event_thread_t *p_event )
p_event->p_vout->p_sys->i_changes = 0;
DirectXCloseWindow( p_event->p_vout );
return NULL;
}
......
......@@ -194,7 +194,7 @@ int DirectDrawUpdateOverlay( vout_thread_t *p_vout );
/*****************************************************************************
* Prototypes from events.c
*****************************************************************************/
void EventThread ( event_thread_t *p_event );
void* EventThread ( vlc_object_t *p_this );
void UpdateRects ( vout_thread_t *p_vout, bool b_force );
void Win32ToggleFullscreen ( vout_thread_t *p_vout );
......
......@@ -103,7 +103,7 @@ static void FreePicture ( vout_thread_t *, picture_t * );
static void ToggleFullScreen ( vout_thread_t * );
static void RunQtThread( event_thread_t *p_event );
static void* RunQtThread( vlc_object_t *p_this );
} /* extern "C" */
/*****************************************************************************
......@@ -588,8 +588,9 @@ static void CloseDisplay( vout_thread_t *p_vout )
/*****************************************************************************
* main loop of qtapplication
*****************************************************************************/
static void RunQtThread(event_thread_t *p_event)
static void* RunQtThread( vlc_object_t *p_this )
{
event_thread_t *p_event = (event_thread_t *)p_this;
msg_Dbg( p_event->p_vout, "RunQtThread starting" );
#ifdef NEED_QTE_MAIN
......@@ -668,5 +669,6 @@ static void RunQtThread(event_thread_t *p_event)
#endif
msg_Dbg( p_event->p_vout, "RunQtThread terminating" );
return NULL;
}
......@@ -63,7 +63,7 @@ typedef struct aout_filter_sys_t
static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
static void Thread ( vlc_object_t * );
static void* Thread ( vlc_object_t * );
static char *TitleGet( vlc_object_t * );
......@@ -188,7 +188,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter,
/*****************************************************************************
* Thread:
*****************************************************************************/
static void Thread( vlc_object_t *p_this )
static void* Thread( vlc_object_t *p_this )
{
galaktos_thread_t *p_thread = (galaktos_thread_t*)p_this;
......@@ -202,10 +202,7 @@ static void Thread( vlc_object_t *p_this )
p_thread->p_opengl =
(vout_thread_t *)vlc_object_create( p_this, VLC_OBJECT_OPENGL );
if( p_thread->p_opengl == NULL )
{
msg_Err( p_thread, "out of memory" );
return;
}
return NULL;
vlc_object_attach( p_thread->p_opengl, p_this );
/* Initialize vout parameters */
......@@ -231,7 +228,7 @@ static void Thread( vlc_object_t *p_this )
msg_Err( p_thread, "unable to initialize OpenGL" );
vlc_object_detach( p_thread->p_opengl );
vlc_object_release( p_thread->p_opengl );
return;
return NULL;
}
p_thread->p_opengl->pf_init( p_thread->p_opengl );
......@@ -269,6 +266,7 @@ static void Thread( vlc_object_t *p_this )
module_Unneed( p_thread->p_opengl, p_thread->p_module );
vlc_object_detach( p_thread->p_opengl );
vlc_object_release( p_thread->p_opengl );
return NULL;
}
/*****************************************************************************
......
......@@ -121,7 +121,7 @@ typedef struct aout_filter_sys_t
static void DoWork ( aout_instance_t *, aout_filter_t *, aout_buffer_t *,
aout_buffer_t * );
static void Thread ( vlc_object_t * );
static void* Thread ( vlc_object_t * );
static char *TitleGet( vlc_object_t * );
......@@ -317,7 +317,7 @@ static int FillBuffer( int16_t *p_data, int *pi_data,
/*****************************************************************************
* Thread:
*****************************************************************************/
static void Thread( vlc_object_t *p_this )
static void* Thread( vlc_object_t *p_this )
{
goom_thread_t *p_thread = (goom_thread_t*)p_this;
vlc_value_t width, height, speed;
......@@ -375,6 +375,7 @@ static void Thread( vlc_object_t *p_this )
}
goom_close( p_plugin_info );
return NULL;
}
/*****************************************************************************
......
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