Commit a7d8f15b authored by Rémi Duraffort's avatar Rémi Duraffort

Use the right declaration for threaded functions.

parent 0d5db2b4
...@@ -97,7 +97,7 @@ typedef struct ...@@ -97,7 +97,7 @@ typedef struct
} event_thread_t; } event_thread_t;
static int Raw1394EventThread( vlc_object_t * ); static void* Raw1394EventThread( vlc_object_t * );
static int Raw1394Handler( raw1394handle_t, int, size_t, quadlet_t * ); static int Raw1394Handler( raw1394handle_t, int, size_t, quadlet_t * );
static int Raw1394GetNumPorts( access_t *p_access ); static int Raw1394GetNumPorts( access_t *p_access );
...@@ -357,7 +357,7 @@ static block_t *Block( access_t *p_access ) ...@@ -357,7 +357,7 @@ static block_t *Block( access_t *p_access )
return p_block; return p_block;
} }
static int Raw1394EventThread( vlc_object_t *p_this ) static void* Raw1394EventThread( vlc_object_t *p_this )
{ {
event_thread_t *p_ev = (event_thread_t *) p_this; event_thread_t *p_ev = (event_thread_t *) p_this;
access_t *p_access = (access_t *) p_ev->p_access; access_t *p_access = (access_t *) p_ev->p_access;
...@@ -386,7 +386,7 @@ static int Raw1394EventThread( vlc_object_t *p_this ) ...@@ -386,7 +386,7 @@ static int Raw1394EventThread( vlc_object_t *p_this )
} }
AVCStop( p_access, p_sys->i_node ); AVCStop( p_access, p_sys->i_node );
return VLC_SUCCESS; return NULL;
} }
static int Raw1394Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ) static int Raw1394Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data )
......
...@@ -122,7 +122,7 @@ typedef struct ...@@ -122,7 +122,7 @@ typedef struct
} event_thread_t; } event_thread_t;
static int EventThread( vlc_object_t * ); static void* EventThread( vlc_object_t * );
struct demux_sys_t struct demux_sys_t
{ {
...@@ -1221,7 +1221,7 @@ static int EventMouse( vlc_object_t *, char const *, ...@@ -1221,7 +1221,7 @@ static int EventMouse( vlc_object_t *, char const *,
static int EventKey ( vlc_object_t *, char const *, static int EventKey ( vlc_object_t *, char const *,
vlc_value_t, vlc_value_t, void * ); vlc_value_t, vlc_value_t, void * );
static int EventThread( vlc_object_t *p_this ) static void* EventThread( vlc_object_t *p_this )
{ {
event_thread_t *p_ev = (event_thread_t*)p_this; event_thread_t *p_ev = (event_thread_t*)p_this;
demux_sys_t *p_sys = p_ev->p_demux->p_sys; demux_sys_t *p_sys = p_ev->p_demux->p_sys;
...@@ -1346,7 +1346,7 @@ static int EventThread( vlc_object_t *p_this ) ...@@ -1346,7 +1346,7 @@ static int EventThread( vlc_object_t *p_this )
vlc_mutex_destroy( &p_ev->lock ); vlc_mutex_destroy( &p_ev->lock );
return VLC_SUCCESS; return NULL;
} }
static int EventMouse( vlc_object_t *p_this, char const *psz_var, static int EventMouse( vlc_object_t *p_this, char const *psz_var,
......
...@@ -92,7 +92,7 @@ static int mms_HeaderMediaRead( access_t *, int ); ...@@ -92,7 +92,7 @@ static int mms_HeaderMediaRead( access_t *, int );
static int mms_ReceivePacket( access_t * ); static int mms_ReceivePacket( access_t * );
static void KeepAliveThread( vlc_object_t *p_this ); static void* KeepAliveThread( vlc_object_t *p_this );
int MMSTUOpen( access_t *p_access ) int MMSTUOpen( access_t *p_access )
{ {
...@@ -1599,7 +1599,7 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type ) ...@@ -1599,7 +1599,7 @@ static int mms_HeaderMediaRead( access_t *p_access, int i_type )
return -1; return -1;
} }
static void KeepAliveThread( vlc_object_t *p_this ) static void* KeepAliveThread( vlc_object_t *p_this )
{ {
mmstu_keepalive_thread_t *p_thread = (mmstu_keepalive_thread_t *) p_this; mmstu_keepalive_thread_t *p_thread = (mmstu_keepalive_thread_t *) p_this;
access_t *p_access = p_thread->p_access; access_t *p_access = p_thread->p_access;
...@@ -1618,4 +1618,5 @@ static void KeepAliveThread( vlc_object_t *p_this ) ...@@ -1618,4 +1618,5 @@ static void KeepAliveThread( vlc_object_t *p_this )
vlc_object_timedwait( p_thread, mdate() + 10000000 ); vlc_object_timedwait( p_thread, mdate() + 10000000 );
} }
vlc_object_unlock( p_thread ); vlc_object_unlock( p_thread );
return NULL;
} }
...@@ -70,7 +70,7 @@ static ssize_t Read( access_t *, uint8_t *, size_t ); ...@@ -70,7 +70,7 @@ static ssize_t Read( access_t *, uint8_t *, size_t );
static int Seek( access_t *, int64_t ); static int Seek( access_t *, int64_t );
static int Control( access_t *, int, va_list ); static int Control( access_t *, int, va_list );
static void ThreadControl( vlc_object_t * ); static void* ThreadControl( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
* Open: open the rtmp connection * Open: open the rtmp connection
...@@ -503,7 +503,7 @@ static int Control( access_t *p_access, int i_query, va_list args ) ...@@ -503,7 +503,7 @@ static int Control( access_t *p_access, int i_query, va_list args )
/***************************************************************************** /*****************************************************************************
* ThreadControl: manage control messages and pipe media to Read * ThreadControl: manage control messages and pipe media to Read
*****************************************************************************/ *****************************************************************************/
static void ThreadControl( vlc_object_t *p_this ) static void* ThreadControl( vlc_object_t *p_this )
{ {
rtmp_control_thread_t *p_thread = (rtmp_control_thread_t *) p_this; rtmp_control_thread_t *p_thread = (rtmp_control_thread_t *) p_this;
rtmp_packet_t *rtmp_packet; rtmp_packet_t *rtmp_packet;
...@@ -543,4 +543,5 @@ static void ThreadControl( vlc_object_t *p_this ) ...@@ -543,4 +543,5 @@ static void ThreadControl( vlc_object_t *p_this )
block_FifoWake( p_thread->p_fifo_input ); block_FifoWake( p_thread->p_fifo_input );
} }
} }
return NULL;
} }
...@@ -85,7 +85,7 @@ vlc_module_end(); ...@@ -85,7 +85,7 @@ vlc_module_end();
static int Seek( access_t *, int64_t ); static int Seek( access_t *, int64_t );
static block_t *Block ( access_t *p_access ); static block_t *Block ( access_t *p_access );
static int Control( access_t *, int i_query, va_list args ); static int Control( access_t *, int i_query, va_list args );
static void Thread ( access_t *p_access ); static void* Thread ( vlc_object_t *p_this );
static int WriteBlockToFile( access_t *p_access, block_t *p_block ); static int WriteBlockToFile( access_t *p_access, block_t *p_block );
static block_t *ReadBlockFromFile( access_t *p_access ); static block_t *ReadBlockFromFile( access_t *p_access );
static char *GetTmpFilePath( access_t *p_access ); static char *GetTmpFilePath( access_t *p_access );
...@@ -269,8 +269,9 @@ static block_t *Block( access_t *p_access ) ...@@ -269,8 +269,9 @@ static block_t *Block( access_t *p_access )
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
static void Thread( access_t *p_access ) static void* Thread( vlc_object_t* p_this )
{ {
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys = p_access->p_sys; access_sys_t *p_sys = p_access->p_sys;
access_t *p_src = p_access->p_source; access_t *p_src = p_access->p_source;
block_t *p_block; block_t *p_block;
...@@ -352,6 +353,7 @@ static void Thread( access_t *p_access ) ...@@ -352,6 +353,7 @@ static void Thread( access_t *p_access )
/* Send dummy packet to avoid deadlock in Block() */ /* Send dummy packet to avoid deadlock in Block() */
block_FifoPut( p_sys->p_fifo, block_New( p_access, 0 ) ); block_FifoPut( p_sys->p_fifo, block_New( p_access, 0 ) );
return NULL;
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -244,10 +244,10 @@ static void FreeLine( line_desc_t * ); ...@@ -244,10 +244,10 @@ static void FreeLine( line_desc_t * );
#ifdef HAVE_FONTCONFIG #ifdef HAVE_FONTCONFIG
static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_lock ); static vlc_object_t *FontBuilderAttach( filter_t *p_filter, vlc_mutex_t **pp_lock );
static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder ); static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder );
static void FontBuilderThread( vlc_object_t *p_this); static void* FontBuilderThread( vlc_object_t *p_this);
static void FontBuilderDestructor( vlc_object_t *p_this ); static void FontBuilderDestructor( vlc_object_t *p_this );
static int FontBuilderDone( vlc_object_t*, const char *, vlc_value_t, vlc_value_t, static int FontBuilderDone( vlc_object_t*, const char *, vlc_value_t, vlc_value_t,
void* ); void* );
#endif #endif
...@@ -515,7 +515,7 @@ static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder ) ...@@ -515,7 +515,7 @@ static void FontBuilderDetach( filter_t *p_filter, vlc_object_t *p_fontbuilder )
} }
vlc_mutex_unlock( lock ); vlc_mutex_unlock( lock );
} }
static void FontBuilderThread( vlc_object_t *p_this ) static void* FontBuilderThread( vlc_object_t *p_this )
{ {
FcConfig *p_fontconfig = FcInitLoadConfig(); FcConfig *p_fontconfig = FcInitLoadConfig();
...@@ -548,6 +548,7 @@ static void FontBuilderThread( vlc_object_t *p_this ) ...@@ -548,6 +548,7 @@ static void FontBuilderThread( vlc_object_t *p_this )
var_SetBool( p_this, "build-done", true ); var_SetBool( p_this, "build-done", true );
} }
return NULL;
} }
static void FontBuilderDestructor( vlc_object_t *p_this ) static void FontBuilderDestructor( vlc_object_t *p_this )
{ {
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close ( vlc_object_t * );
static void GtkMain ( vlc_object_t * ); static void* GtkMain ( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
* Local variables (mutex-protected). * Local variables (mutex-protected).
...@@ -158,7 +158,7 @@ static gint foo( gpointer bar ) { return TRUE; } ...@@ -158,7 +158,7 @@ static gint foo( gpointer bar ) { return TRUE; }
* this part of the interface is in a separate thread so that we can call * this part of the interface is in a separate thread so that we can call
* gtk_main() from within it without annoying the rest of the program. * gtk_main() from within it without annoying the rest of the program.
*****************************************************************************/ *****************************************************************************/
static void GtkMain( vlc_object_t *p_this ) static void* GtkMain( vlc_object_t *p_this )
{ {
/* gtk_init needs to know the command line. We don't care, so we /* gtk_init needs to know the command line. We don't care, so we
* give it an empty one */ * give it an empty one */
...@@ -197,4 +197,5 @@ static void GtkMain( vlc_object_t *p_this ) ...@@ -197,4 +197,5 @@ static void GtkMain( vlc_object_t *p_this )
gtk_main(); gtk_main();
gdk_threads_leave(); gdk_threads_leave();
return NULL;
} }
...@@ -56,7 +56,7 @@ typedef struct qte_thread_t ...@@ -56,7 +56,7 @@ typedef struct qte_thread_t
static int Open ( vlc_object_t * ); static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * ); static void Close ( vlc_object_t * );
static void QteMain ( qte_thread_t * ); static void* QteMain( vlc_object_t * );
/***************************************************************************** /*****************************************************************************
* Local variables (mutex-protected). * Local variables (mutex-protected).
...@@ -158,8 +158,9 @@ static void Close( vlc_object_t *p_this ) ...@@ -158,8 +158,9 @@ static void Close( vlc_object_t *p_this )
* this part of the interface is in a separate thread so that we can call * this part of the interface is in a separate thread so that we can call
* qte_main() from within it without annoying the rest of the program. * qte_main() from within it without annoying the rest of the program.
*****************************************************************************/ *****************************************************************************/
static void QteMain( qte_thread_t *p_this ) static void* QteMain( vlc_object_t* p_vlc_obj )
{ {
qte_thread_t *p_this = (qte_thread_t*)p_vlc_obj;
int i_argc = 1; int i_argc = 1;
p_this->b_gui_server = false; p_this->b_gui_server = false;
...@@ -189,4 +190,6 @@ static void QteMain( qte_thread_t *p_this ) ...@@ -189,4 +190,6 @@ static void QteMain( qte_thread_t *p_this )
vlc_thread_ready( p_this ); vlc_thread_ready( p_this );
p_this->p_qte_application->exec(); p_this->p_qte_application->exec();
return NULL;
} }
...@@ -226,9 +226,9 @@ static void MediaDel( vod_t *, vod_media_t * ); ...@@ -226,9 +226,9 @@ static void MediaDel( vod_t *, vod_media_t * );
static int MediaAddES( vod_t *, vod_media_t *, es_format_t * ); static int MediaAddES( vod_t *, vod_media_t *, es_format_t * );
static void MediaDelES( vod_t *, vod_media_t *, es_format_t * ); static void MediaDelES( vod_t *, vod_media_t *, es_format_t * );
static void CommandThread( vlc_object_t *p_this ); static void* CommandThread( vlc_object_t *p_this );
static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session, static void CommandPush( vod_t *, rtsp_cmd_type_t, vod_media_t *, const char *psz_session,
double f_arg, const char *psz_arg ); double f_arg, const char *psz_arg );
static rtsp_client_t *RtspClientNew( vod_media_t *, char * ); static rtsp_client_t *RtspClientNew( vod_media_t *, char * );
static rtsp_client_t *RtspClientGet( vod_media_t *, const char * ); static rtsp_client_t *RtspClientGet( vod_media_t *, const char * );
...@@ -801,7 +801,7 @@ static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_me ...@@ -801,7 +801,7 @@ static void CommandPush( vod_t *p_vod, rtsp_cmd_type_t i_type, vod_media_t *p_me
block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd ); block_FifoPut( p_vod->p_sys->p_fifo_cmd, p_cmd );
} }
static void CommandThread( vlc_object_t *p_this ) static void* CommandThread( vlc_object_t *p_this )
{ {
vod_t *p_vod = (vod_t*)p_this; vod_t *p_vod = (vod_t*)p_this;
vod_sys_t *p_sys = p_vod->p_sys; vod_sys_t *p_sys = p_vod->p_sys;
...@@ -872,6 +872,7 @@ static void CommandThread( vlc_object_t *p_this ) ...@@ -872,6 +872,7 @@ static void CommandThread( vlc_object_t *p_this )
free( cmd.psz_session ); free( cmd.psz_session );
free( cmd.psz_arg ); free( cmd.psz_arg );
} }
return NULL;
} }
/**************************************************************************** /****************************************************************************
......
...@@ -232,7 +232,7 @@ static int MuxSend( sout_stream_t *, sout_stream_id_t *, ...@@ -232,7 +232,7 @@ static int MuxSend( sout_stream_t *, sout_stream_id_t *,
block_t* ); block_t* );
static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout ); static sout_access_out_t *GrabberCreate( sout_stream_t *p_sout );
static void ThreadSend( vlc_object_t *p_this ); static void* ThreadSend( vlc_object_t *p_this );
static void SDPHandleUrl( sout_stream_t *, const char * ); static void SDPHandleUrl( sout_stream_t *, const char * );
...@@ -1429,7 +1429,7 @@ static int HttpCallback( httpd_file_sys_t *p_args, ...@@ -1429,7 +1429,7 @@ static int HttpCallback( httpd_file_sys_t *p_args,
/**************************************************************************** /****************************************************************************
* RTP send * RTP send
****************************************************************************/ ****************************************************************************/
static void ThreadSend( vlc_object_t *p_this ) static void* ThreadSend( vlc_object_t *p_this )
{ {
sout_stream_id_t *id = (sout_stream_id_t *)p_this; sout_stream_id_t *id = (sout_stream_id_t *)p_this;
unsigned i_caching = id->i_caching; unsigned i_caching = id->i_caching;
...@@ -1498,6 +1498,7 @@ static void ThreadSend( vlc_object_t *p_this ) ...@@ -1498,6 +1498,7 @@ static void ThreadSend( vlc_object_t *p_this )
rtp_add_sink( id, fd, true ); rtp_add_sink( id, fd, true );
} }
} }
return NULL;
} }
int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux ) int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux )
......
...@@ -285,7 +285,7 @@ static void transcode_osd_close ( sout_stream_t *, sout_stream_id_t * ); ...@@ -285,7 +285,7 @@ static void transcode_osd_close ( sout_stream_t *, sout_stream_id_t * );
static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *, static int transcode_osd_process( sout_stream_t *, sout_stream_id_t *,
block_t *, block_t ** ); block_t *, block_t ** );
static int EncoderThread( struct sout_stream_sys_t * p_sys ); static void* EncoderThread( vlc_object_t * p_this );
static const int pi_channels_maps[6] = static const int pi_channels_maps[6] =
{ {
...@@ -2078,8 +2078,9 @@ static int transcode_video_process( sout_stream_t *p_stream, ...@@ -2078,8 +2078,9 @@ static int transcode_video_process( sout_stream_t *p_stream,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
static int EncoderThread( sout_stream_sys_t *p_sys ) static void* EncoderThread( vlc_object_t* p_this )
{ {
sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_this;
sout_stream_id_t *id = p_sys->id_video; sout_stream_id_t *id = p_sys->id_video;
picture_t *p_pic; picture_t *p_pic;
...@@ -2122,7 +2123,7 @@ static int EncoderThread( sout_stream_sys_t *p_sys ) ...@@ -2122,7 +2123,7 @@ static int EncoderThread( sout_stream_sys_t *p_sys )
} }
block_ChainRelease( p_sys->p_buffers ); block_ChainRelease( p_sys->p_buffers );
return 0; return NULL;
} }
struct picture_sys_t struct picture_sys_t
......
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