static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
static void DeleteDecoder( decoder_t * );
-static int DecoderThread( decoder_t * );
+static void* DecoderThread( vlc_object_t * );
static int DecoderDecode( decoder_t * p_dec, block_t *p_block );
/* Buffers allocation callbacks for the decoders */
* \param p_dec the decoder
* \return 0
*/
-static int DecoderThread( decoder_t * p_dec )
+static void* DecoderThread( vlc_object_t *p_this )
{
+ decoder_t * p_dec = (decoder_t *)p_this;
block_t *p_block;
/* The decoder's main loop */
static int DStreamRead ( stream_t *, void *p_read, int i_read );
static int DStreamPeek ( stream_t *, const uint8_t **pp_peek, int i_peek );
static int DStreamControl( stream_t *, int i_query, va_list );
-static int DStreamThread ( stream_t * );
+static void* DStreamThread ( vlc_object_t * );
stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
}
}
-static int DStreamThread( stream_t *s )
+static void* DStreamThread( vlc_object_t* p_this )
{
+ stream_t *s = (stream_t *)p_this;
d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
demux_t *p_demux;
if( !(p_demux = demux_New( s, "", p_sys->psz_name, "", s, p_sys->out,
false )) )
{
- return VLC_EGENERIC;
+ return NULL;
}
p_sys->p_demux = p_demux;
}
vlc_object_kill( p_demux );
- return VLC_SUCCESS;
+ return NULL;
}
/****************************************************************************
*****************************************************************************/
static void Destructor( input_thread_t * p_input );
-static int Run ( input_thread_t *p_input );
-static int RunAndDestroy ( input_thread_t *p_input );
+static void* Run ( vlc_object_t *p_this );
+static void* RunAndDestroy ( vlc_object_t *p_this );
static input_thread_t * Create ( vlc_object_t *, input_item_t *,
const char *, bool, sout_instance_t * );
if( b_block )
{
- RunAndDestroy( p_input );
+ RunAndDestroy( VLC_OBJECT(p_input) );
return VLC_SUCCESS;
}
else
* This is the "normal" thread that spawns the input processing chain,
* reads the stream, cleans up and waits
*****************************************************************************/
-static int Run( input_thread_t *p_input )
+static void* Run( vlc_object_t *p_this )
{
+ input_thread_t *p_input = (input_thread_t *)p_this;
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
/* Tell we're dead */
p_input->b_dead = true;
- return 0;
+ return NULL;
}
MainLoop( p_input );
/* Clean up */
End( p_input );
- return 0;
+ return NULL;
}
/*****************************************************************************
* This is the "just forget me" thread that spawns the input processing chain,
* reads the stream, cleans up and releases memory
*****************************************************************************/
-static int RunAndDestroy( input_thread_t *p_input )
+static void* RunAndDestroy( vlc_object_t *p_this )
{
+ input_thread_t *p_input = (input_thread_t *)p_this;
/* Signal that the thread is launched */
vlc_thread_ready( p_input );
*****************************************************************************/
static void vlm_Destructor( vlm_t *p_vlm );
-static int Manage( vlc_object_t * );
+static void* Manage( vlc_object_t * );
static int vlm_MediaVodControl( void *, vod_media_t *, const char *, int, va_list );
/*****************************************************************************
/*****************************************************************************
* Manage:
*****************************************************************************/
-static int Manage( vlc_object_t* p_object )
+static void* Manage( vlc_object_t* p_object )
{
vlm_t *vlm = (vlm_t*)p_object;
int i, j;
msleep( 100000 );
}
- return VLC_SUCCESS;
+ return NULL;
}
/* New API
*****************************************************************************/
static interaction_t * InteractionGet( vlc_object_t * );
static void InteractionSearchInterface( interaction_t * );
-static void InteractionLoop( vlc_object_t * );
+static void* InteractionLoop( vlc_object_t * );
static void InteractionManage( interaction_t * );
static interaction_dialog_t *DialogGetById( interaction_t* , int );
}
}
-static void InteractionLoop( vlc_object_t *p_this )
+static void* InteractionLoop( vlc_object_t *p_this )
{
int i;
interaction_t *p_interaction = (interaction_t*) p_this;
DialogDestroy( p_dialog );
REMOVE_ELEM( p_interaction->pp_dialogs, p_interaction->i_dialogs, i );
}
+ return NULL;
}
/**
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf );
+static void* RunInterface( vlc_object_t *p_this );
#ifdef __APPLE__
static void MonitorLibVLCDeath( intf_thread_t *p_intf );
#endif
/*****************************************************************************
* RunInterface: setups necessary data and give control to the interface
*****************************************************************************/
-static void RunInterface( intf_thread_t *p_intf )
+static void* RunInterface( vlc_object_t *p_this )
{
+ intf_thread_t *p_intf = (intf_thread_t *)p_this;
vlc_value_t val, text;
char *psz_intf;
p_intf->p_module = module_Need( p_intf, "interface", psz_intf, 0 );
}
while( p_intf->p_module );
+ return NULL;
}
#ifdef __APPLE__
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static void AppThread( vlc_object_t *p_appthread );
+static void* AppThread( vlc_object_t *p_appthread );
/*****************************************************************************
* system_Init: create a BApplication object and fill in program path.
/*****************************************************************************
* AppThread: the BApplication thread.
*****************************************************************************/
-static void AppThread( vlc_object_t * p_this )
+static void* AppThread( vlc_object_t * p_this )
{
VlcApplication * BeApp =
new VlcApplication("application/x-vnd.videolan-vlc");
BeApp->Run();
vlc_object_detach( p_this );
delete BeApp;
+ return NULL;
}
} /* extern "C" */
return false;
}
-static void update_CheckReal( update_check_thread_t *p_uct );
+static void* update_CheckReal( vlc_object_t *p_this );
/**
* Check for updates
VLC_THREAD_PRIORITY_LOW, false );
}
-void update_CheckReal( update_check_thread_t *p_uct )
+void* update_CheckReal( vlc_object_t* p_this )
{
+ update_check_thread_t *p_uct = (update_check_thread_t *)p_this;
bool b_ret;
vlc_mutex_lock( &p_uct->p_update->lock );
p_uct->p_update->p_check = NULL;
vlc_object_release( p_uct );
+ return NULL;
}
/**
return i_retval == -1 ? NULL : psz_tmp;
}
-static void update_DownloadReal( update_download_thread_t *p_udt );
+static void* update_DownloadReal( vlc_object_t *p_this );
/**
* Download the file given in the update_t
VLC_THREAD_PRIORITY_LOW, false );
}
-static void update_DownloadReal( update_download_thread_t *p_udt )
+static void* update_DownloadReal( vlc_object_t *p_this )
{
+ update_download_thread_t *p_udt = (update_download_thread_t *)p_this;
int i_progress = 0;
long int l_size;
long int l_downloaded = 0;
p_udt->p_update->p_download = NULL;
vlc_object_release( p_udt );
+ return NULL;
}
update_release_t *update_GetRelease( update_t *p_update )
/*****************************************************************************
* system_Configure: check for system specific configuration options.
*****************************************************************************/
-static void IPCHelperThread( vlc_object_t * );
+static void* IPCHelperThread( vlc_object_t * );
LRESULT CALLBACK WMCOPYWNDPROC( HWND, UINT, WPARAM, LPARAM );
typedef struct
{
#endif
}
-static void IPCHelperThread( vlc_object_t *p_this )
+static void* IPCHelperThread( vlc_object_t *p_this )
{
HWND ipcwindow;
MSG message;
TranslateMessage( &message );
DispatchMessage( &message );
}
+ return NULL;
}
LRESULT CALLBACK WMCOPYWNDPROC( HWND hwnd, UINT uMsg, WPARAM wParam,
/*****************************************************************************
* Low level
*****************************************************************************/
-static void httpd_HostThread( httpd_host_t * );
+static void* httpd_HostThread( vlc_object_t * );
/* create a new host */
httpd_host_t *httpd_HostNew( vlc_object_t *p_this, const char *psz_host,
}
}
-static void httpd_HostThread( httpd_host_t *host )
+static void* httpd_HostThread( vlc_object_t *p_this )
{
+ httpd_host_t *host = (httpd_host_t *)p_this;
tls_session_t *p_tls = NULL;
counter_t *p_total_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
counter_t *p_active_counter = stats_CounterCreate( host, VLC_VAR_INTEGER, STATS_COUNTER );
stats_CounterClean( p_total_counter );
if( p_active_counter )
stats_CounterClean( p_active_counter );
+ return NULL;
}
#else /* ENABLE_HTTPD */
#include "playlist_internal.h"
#include "../libvlc.h"
-static void RunSD( services_discovery_t *p_sd );
+static void* RunSD( vlc_object_t *p_this );
/*
* Services discovery
/***********************************************************************
* RunSD (Private)
***********************************************************************/
-static void RunSD( services_discovery_t *p_sd )
+static void* RunSD( vlc_object_t *p_this )
{
+ services_discovery_t *p_sd = (services_discovery_t *)p_this;
vlc_event_t event;
event.type = vlc_ServicesDiscoveryStarted;
event.type = vlc_ServicesDiscoveryEnded;
vlc_event_send( &p_sd->event_manager, &event );
- return;
+ return NULL;
}
/*