diff options
Diffstat (limited to 'src/xine-engine')
36 files changed, 349 insertions, 352 deletions
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c index 1946b3dd0..b91072523 100644 --- a/src/xine-engine/audio_decoder.c +++ b/src/xine-engine/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.108 2003/07/27 12:47:23 hadess Exp $ + * $Id: audio_decoder.c,v 1.109 2003/11/11 18:45:00 f1rmb Exp $ * * * functions that implement audio decoding @@ -65,7 +65,7 @@ static void *audio_decoder_loop (void *stream_gen) { buf->pts, buf->type); #endif - extra_info_merge( stream->audio_decoder_extra_info, buf->extra_info ); + _x_extra_info_merge( stream->audio_decoder_extra_info, buf->extra_info ); stream->audio_decoder_extra_info->seek_count = stream->video_seek_count; /* check for a new port to use */ @@ -107,7 +107,7 @@ static void *audio_decoder_loop (void *stream_gen) { printf ("audio_decoder: close old decoder\n"); #endif - free_audio_decoder (stream, stream->audio_decoder_plugin); + _x_free_audio_decoder (stream, stream->audio_decoder_plugin); stream->audio_decoder_plugin = NULL; stream->audio_track_map_entries = 0; stream->audio_type = 0; @@ -151,7 +151,7 @@ static void *audio_decoder_loop (void *stream_gen) { case BUF_CONTROL_QUIT: if (stream->audio_decoder_plugin) { - free_audio_decoder (stream, stream->audio_decoder_plugin); + _x_free_audio_decoder (stream, stream->audio_decoder_plugin); stream->audio_decoder_plugin = NULL; stream->audio_track_map_entries = 0; stream->audio_type = 0; @@ -166,7 +166,7 @@ static void *audio_decoder_loop (void *stream_gen) { #ifdef LOG printf ("audio_decoder: reset\n"); #endif - extra_info_reset( stream->audio_decoder_extra_info ); + _x_extra_info_reset( stream->audio_decoder_extra_info ); if (stream->audio_decoder_plugin) stream->audio_decoder_plugin->reset (stream->audio_decoder_plugin); break; @@ -286,11 +286,11 @@ static void *audio_decoder_loop (void *stream_gen) { !stream->audio_decoder_plugin) ) { if (stream->audio_decoder_plugin) { - free_audio_decoder (stream, stream->audio_decoder_plugin); + _x_free_audio_decoder (stream, stream->audio_decoder_plugin); } stream->audio_decoder_streamtype = streamtype; - stream->audio_decoder_plugin = get_audio_decoder (stream, streamtype); + stream->audio_decoder_plugin = _x_get_audio_decoder (stream, streamtype); stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED] = (stream->audio_decoder_plugin != NULL); @@ -318,17 +318,17 @@ static void *audio_decoder_loop (void *stream_gen) { !stream->stream_info[XINE_STREAM_INFO_AUDIO_HANDLED]) { xine_log (stream->xine, XINE_LOG_MSG, "audio_decoder: no plugin available to handle '%s'\n", - buf_audio_name( buf->type ) ); + _x_buf_audio_name( buf->type ) ); if( !stream->meta_info[XINE_META_INFO_AUDIOCODEC] ) stream->meta_info[XINE_META_INFO_AUDIOCODEC] - = strdup (buf_audio_name( buf->type )); + = strdup (_x_buf_audio_name( buf->type )); buftype_unknown = buf->type; /* fatal error - dispose plugin */ if (stream->audio_decoder_plugin) { - free_audio_decoder (stream, stream->audio_decoder_plugin); + _x_free_audio_decoder (stream, stream->audio_decoder_plugin); stream->audio_decoder_plugin = NULL; } } @@ -350,7 +350,7 @@ static void *audio_decoder_loop (void *stream_gen) { return NULL; } -void audio_decoder_init (xine_stream_t *stream) { +void _x_audio_decoder_init (xine_stream_t *stream) { pthread_attr_t pth_attrs; struct sched_param pth_params; @@ -368,7 +368,7 @@ void audio_decoder_init (xine_stream_t *stream) { * We provide buffers of 8k size instead of 2k for demuxers sending * larger chunks. */ - stream->audio_fifo = fifo_buffer_new (230, 8192); + stream->audio_fifo = _x_fifo_buffer_new (230, 8192); stream->audio_channel_user = -1; stream->audio_channel_auto = -1; stream->audio_track_map_entries = 0; @@ -394,7 +394,7 @@ void audio_decoder_init (xine_stream_t *stream) { pthread_attr_destroy(&pth_attrs); } -void audio_decoder_shutdown (xine_stream_t *stream) { +void _x_audio_decoder_shutdown (xine_stream_t *stream) { buf_element_t *buf; void *p; @@ -416,7 +416,7 @@ void audio_decoder_shutdown (xine_stream_t *stream) { pthread_cond_broadcast(&stream->next_audio_port_wired); } -int xine_get_audio_channel (xine_stream_t *stream) { +int _x_get_audio_channel (xine_stream_t *stream) { return stream->audio_type & 0xFFFF; } diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index b925adc33..7f38e6ece 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.149 2003/10/30 22:40:53 mroi Exp $ + * $Id: audio_out.c,v 1.150 2003/11/11 18:45:00 f1rmb Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -648,7 +648,7 @@ static audio_buffer_t* prepare_samples( aos_t *this, audio_buffer_t *buf) { this->output.bits != 8 || this->input.mode != this->output.mode) ) { ensure_buffer_size(this->frame_buf[1], 2*mode_channels(this->input.mode), buf->num_frames ); - audio_out_resample_8to16((int8_t *)buf->mem, this->frame_buf[1]->mem, + _x_audio_out_resample_8to16((int8_t *)buf->mem, this->frame_buf[1]->mem, mode_channels(this->input.mode) * buf->num_frames ); buf = swap_frame_buffers(this); } @@ -659,19 +659,19 @@ static audio_buffer_t* prepare_samples( aos_t *this, audio_buffer_t *buf) { switch (this->input.mode) { case AO_CAP_MODE_MONO: ensure_buffer_size(this->frame_buf[1], 2, num_output_frames); - audio_out_resample_mono (buf->mem, buf->num_frames, + _x_audio_out_resample_mono (buf->mem, buf->num_frames, this->frame_buf[1]->mem, num_output_frames); buf = swap_frame_buffers(this); break; case AO_CAP_MODE_STEREO: ensure_buffer_size(this->frame_buf[1], 4, num_output_frames); - audio_out_resample_stereo (buf->mem, buf->num_frames, + _x_audio_out_resample_stereo (buf->mem, buf->num_frames, this->frame_buf[1]->mem, num_output_frames); buf = swap_frame_buffers(this); break; case AO_CAP_MODE_4CHANNEL: ensure_buffer_size(this->frame_buf[1], 8, num_output_frames); - audio_out_resample_4channel (buf->mem, buf->num_frames, + _x_audio_out_resample_4channel (buf->mem, buf->num_frames, this->frame_buf[1]->mem, num_output_frames); buf = swap_frame_buffers(this); break; @@ -679,7 +679,7 @@ static audio_buffer_t* prepare_samples( aos_t *this, audio_buffer_t *buf) { case AO_CAP_MODE_5CHANNEL: case AO_CAP_MODE_5_1CHANNEL: ensure_buffer_size(this->frame_buf[1], 12, num_output_frames); - audio_out_resample_6channel (buf->mem, buf->num_frames, + _x_audio_out_resample_6channel (buf->mem, buf->num_frames, this->frame_buf[1]->mem, num_output_frames); buf = swap_frame_buffers(this); break; @@ -696,16 +696,16 @@ static audio_buffer_t* prepare_samples( aos_t *this, audio_buffer_t *buf) { case AO_CAP_MODE_MONO: if( this->output.mode == AO_CAP_MODE_STEREO ) { ensure_buffer_size(this->frame_buf[1], 4, buf->num_frames ); - audio_out_resample_monotostereo(buf->mem, this->frame_buf[1]->mem, - buf->num_frames ); + _x_audio_out_resample_monotostereo(buf->mem, this->frame_buf[1]->mem, + buf->num_frames ); buf = swap_frame_buffers(this); } break; case AO_CAP_MODE_STEREO: if( this->output.mode == AO_CAP_MODE_MONO ) { ensure_buffer_size(this->frame_buf[1], 2, buf->num_frames ); - audio_out_resample_stereotomono(buf->mem, this->frame_buf[1]->mem, - buf->num_frames ); + _x_audio_out_resample_stereotomono(buf->mem, this->frame_buf[1]->mem, + buf->num_frames ); buf = swap_frame_buffers(this); } break; @@ -726,7 +726,7 @@ static audio_buffer_t* prepare_samples( aos_t *this, audio_buffer_t *buf) { this->input.mode != this->output.mode) ) { ensure_buffer_size(this->frame_buf[1], 1*mode_channels(this->output.mode), buf->num_frames ); - audio_out_resample_16to8(buf->mem, (int8_t *)this->frame_buf[1]->mem, + _x_audio_out_resample_16to8(buf->mem, (int8_t *)this->frame_buf[1]->mem, mode_channels(this->output.mode) * buf->num_frames ); buf = swap_frame_buffers(this); } @@ -968,7 +968,7 @@ static void *ao_loop (void *this_gen) { (cur_time - in_buf->stream->current_extra_info->vpts) > 30000 )) { pthread_mutex_lock( &in_buf->stream->current_extra_info_lock ); - extra_info_merge( in_buf->stream->current_extra_info, in_buf->extra_info ); + _x_extra_info_merge( in_buf->stream->current_extra_info, in_buf->extra_info ); pthread_mutex_unlock( &in_buf->stream->current_extra_info_lock ); } @@ -1311,7 +1311,7 @@ static audio_buffer_t *ao_get_buffer (xine_audio_port_t *this_gen) { audio_buffer_t *buf; buf = fifo_remove (this->free_fifo); - extra_info_reset( buf->extra_info ); + _x_extra_info_reset( buf->extra_info ); return buf; } @@ -1335,7 +1335,7 @@ static void ao_put_buffer (xine_audio_port_t *this_gen, buf->format.bits = stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS]; buf->format.rate = stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE]; buf->format.mode = stream->stream_info[XINE_STREAM_INFO_AUDIO_MODE]; - extra_info_merge( buf->extra_info, stream->audio_decoder_extra_info ); + _x_extra_info_merge( buf->extra_info, stream->audio_decoder_extra_info ); buf->vpts = stream->metronom->got_audio_samples(stream->metronom, pts, buf->num_frames); } @@ -1751,7 +1751,7 @@ static void ao_update_av_sync_method(void *this_gen, xine_cfg_entry_t *entry) { this->resample_sync_info.valid = 0; } -xine_audio_port_t *ao_new_port (xine_t *xine, ao_driver_t *driver, +xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) { config_values_t *config = xine->config; diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h index e23f0d07b..fd1906c71 100644 --- a/src/xine-engine/audio_out.h +++ b/src/xine-engine/audio_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.h,v 1.59 2003/10/30 22:40:53 mroi Exp $ + * $Id: audio_out.h,v 1.60 2003/11/11 18:45:00 f1rmb Exp $ */ #ifndef HAVE_AUDIO_OUT_H #define HAVE_AUDIO_OUT_H @@ -263,7 +263,7 @@ struct audio_driver_class_s { * this initiates the audio_out sync routines * found in ./src/xine-engine/audio_out.c */ -xine_audio_port_t *ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) ; +xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) ; /* * audio output modes + capabilities diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c index 0dc0c46e6..e5b4d8ffd 100644 --- a/src/xine-engine/broadcaster.c +++ b/src/xine-engine/broadcaster.c @@ -19,7 +19,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: broadcaster.c,v 1.2 2003/05/16 15:07:37 tchamp Exp $ + * $Id: broadcaster.c,v 1.3 2003/11/11 18:45:00 f1rmb Exp $ * * broadcaster.c - xine network broadcaster * @@ -292,7 +292,7 @@ static void audio_put_cb (fifo_buffer_t *fifo, buf_element_t *buf, void *this_ge pthread_mutex_unlock( &this->lock ); } -broadcaster_t *init_broadcaster(xine_stream_t *stream, int port) +broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) { broadcaster_t *this; struct sockaddr_in servAddr; @@ -342,7 +342,7 @@ broadcaster_t *init_broadcaster(xine_stream_t *stream, int port) return this; } -void close_broadcaster(broadcaster_t *this) +void _x_close_broadcaster(broadcaster_t *this) { int *psock; @@ -374,7 +374,7 @@ void close_broadcaster(broadcaster_t *this) free(this); } -int get_broadcaster_port(broadcaster_t *this) +int _x_get_broadcaster_port(broadcaster_t *this) { return this->port; } diff --git a/src/xine-engine/broadcaster.h b/src/xine-engine/broadcaster.h index 113f4ceb5..81f6e9584 100644 --- a/src/xine-engine/broadcaster.h +++ b/src/xine-engine/broadcaster.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: broadcaster.h,v 1.1 2003/05/15 20:23:18 miguelfreitas Exp $ + * $Id: broadcaster.h,v 1.2 2003/11/11 18:45:00 f1rmb Exp $ * * broadcaster.h * @@ -36,9 +36,9 @@ extern "C" { typedef struct broadcaster_s broadcaster_t; -broadcaster_t *init_broadcaster(xine_stream_t *stream, int port); -void close_broadcaster(broadcaster_t *this); -int get_broadcaster_port(broadcaster_t *this); +broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port); +void _x_close_broadcaster(broadcaster_t *this); +int _x_get_broadcaster_port(broadcaster_t *this); #ifdef __cplusplus diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index f32ff4b84..154634a35 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.c,v 1.31 2003/10/14 22:16:32 tmattern Exp $ + * $Id: buffer.c,v 1.32 2003/11/11 18:45:00 f1rmb Exp $ * * * contents: @@ -98,7 +98,7 @@ static buf_element_t *buffer_pool_alloc (fifo_buffer_t *this) { buf->decoder_flags = 0; memset(buf->decoder_info, 0, sizeof(buf->decoder_info)); memset(buf->decoder_info_ptr, 0, sizeof(buf->decoder_info_ptr)); - extra_info_reset( buf->extra_info ); + _x_extra_info_reset( buf->extra_info ); return buf; } @@ -135,7 +135,7 @@ static buf_element_t *buffer_pool_try_alloc (fifo_buffer_t *this) { buf->decoder_flags = 0; memset(buf->decoder_info, 0, sizeof(buf->decoder_info)); memset(buf->decoder_info_ptr, 0, sizeof(buf->decoder_info_ptr)); - extra_info_reset( buf->extra_info ); + _x_extra_info_reset( buf->extra_info ); } return buf; } @@ -460,7 +460,7 @@ static void fifo_unregister_get_cb (fifo_buffer_t *this, /* * allocate and initialize new (empty) fifo buffer */ -fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size) { +fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) { fifo_buffer_t *this; int i; diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index d60c51611..7d62be4ee 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.122 2003/10/24 02:59:03 tmmm Exp $ + * $Id: buffer.h,v 1.123 2003/11/11 18:45:00 f1rmb Exp $ * * * contents: @@ -490,23 +490,23 @@ struct fifo_buffer_s * allocate num_buffers of buf_size bytes each */ -fifo_buffer_t *fifo_buffer_new (int num_buffers, uint32_t buf_size); +fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size); /* return BUF_VIDEO_xxx given the fourcc * fourcc_int must be read in machine endianness * example: fourcc_int = *(uint32_t *)fourcc_char; */ -uint32_t fourcc_to_buf_video( uint32_t fourcc_int ); +uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ); /* return codec name given BUF_VIDEO_xxx */ -char * buf_video_name( uint32_t buf_type ); +char * _x_buf_video_name( uint32_t buf_type ); /* return BUF_VIDEO_xxx given the formattag */ -uint32_t formattag_to_buf_audio( uint32_t formattag ); +uint32_t _x_formattag_to_buf_audio( uint32_t formattag ); /* return codec name given BUF_VIDEO_xxx */ -char * buf_audio_name( uint32_t buf_type ); +char * _x_buf_audio_name( uint32_t buf_type ); #ifndef ATTRIBUTE_PACKED @@ -549,10 +549,10 @@ typedef struct __attribute__((__packed__)) { #endif /* convert xine_bmiheader struct from little endian */ -void xine_bmiheader_le2me( xine_bmiheader *bih ); +void _x_bmiheader_le2me( xine_bmiheader *bih ); /* convert xine_waveformatex struct from little endian */ -void xine_waveformatex_le2me( xine_waveformatex *wavex ); +void _x_waveformatex_le2me( xine_waveformatex *wavex ); #ifdef __cplusplus } diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 5ca011305..b4b62688e 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer_types.c,v 1.69 2003/10/25 04:03:33 tmmm Exp $ + * $Id: buffer_types.c,v 1.70 2003/11/11 18:45:00 f1rmb Exp $ * * * contents: @@ -916,7 +916,7 @@ static audio_db_t audio_db[] = { }; -uint32_t fourcc_to_buf_video( uint32_t fourcc_int ) { +uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ) { int i, j; static uint32_t cached_fourcc=0; static uint32_t cached_buf_type=0; @@ -936,7 +936,7 @@ static uint32_t cached_buf_type=0; return 0; } -char * buf_video_name( uint32_t buf_type ) { +char * _x_buf_video_name( uint32_t buf_type ) { int i; buf_type &= 0xffff0000; @@ -950,7 +950,7 @@ int i; return ""; } -uint32_t formattag_to_buf_audio( uint32_t formattag ) { +uint32_t _x_formattag_to_buf_audio( uint32_t formattag ) { int i, j; static uint16_t cached_formattag=0; static uint32_t cached_buf_type=0; @@ -970,7 +970,7 @@ static uint32_t cached_buf_type=0; return 0; } -char * buf_audio_name( uint32_t buf_type ) { +char * _x_buf_audio_name( uint32_t buf_type ) { int i; buf_type &= 0xffff0000; @@ -984,7 +984,7 @@ int i; return ""; } -void xine_bmiheader_le2me( xine_bmiheader *bih ) { +void _x_bmiheader_le2me( xine_bmiheader *bih ) { /* OBS: fourcc must be read using machine endianness * so don't play with biCompression here! */ @@ -1001,7 +1001,7 @@ void xine_bmiheader_le2me( xine_bmiheader *bih ) { bih->biClrImportant = le2me_32(bih->biClrImportant); } -void xine_waveformatex_le2me( xine_waveformatex *wavex ) { +void _x_waveformatex_le2me( xine_waveformatex *wavex ) { wavex->wFormatTag = le2me_16(wavex->wFormatTag); wavex->nChannels = le2me_16(wavex->nChannels); diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 555f1e56b..f9bf84951 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.c,v 1.54 2003/11/02 16:59:18 mroi Exp $ + * $Id: configfile.c,v 1.55 2003/11/11 18:45:00 f1rmb Exp $ * * config object (was: file) management - implementation * @@ -955,7 +955,7 @@ static void xine_config_unregister_cb (config_values_t *this, } -config_values_t *xine_config_init () { +config_values_t *_x_config_init (void) { #ifdef HAVE_IRIXAL volatile /* is this a (old, 2.91.66) irix gcc bug?!? */ @@ -989,7 +989,7 @@ config_values_t *xine_config_init () { return this; } -int xine_config_change_opt(config_values_t *config, const char *opt) { +int _x_config_change_opt(config_values_t *config, const char *opt) { cfg_entry_t *entry; int handled = 0; diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h index 8dd6c3214..3ed73e4fb 100644 --- a/src/xine-engine/configfile.h +++ b/src/xine-engine/configfile.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: configfile.h,v 1.30 2003/10/22 19:14:10 mroi Exp $ + * $Id: configfile.h,v 1.31 2003/11/11 18:45:00 f1rmb Exp $ * * config file management * @@ -207,13 +207,13 @@ struct config_values_s { /* * allocate and init a new xine config object */ -config_values_t *xine_config_init (void); +config_values_t *_x_config_init (void); /* * interpret stream_setup part of mrls for config value changes */ -int xine_config_change_opt(config_values_t *config, const char *opt) ; +int _x_config_change_opt(config_values_t *config, const char *opt) ; #ifdef __cplusplus diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c index 482dd96f6..1daee4d91 100644 --- a/src/xine-engine/demux.c +++ b/src/xine-engine/demux.c @@ -58,7 +58,7 @@ * indication must be sent. relative discontinuities are likely * to cause "jumps" on metronom. */ -void xine_demux_flush_engine (xine_stream_t *stream) { +void _x_demux_flush_engine (xine_stream_t *stream) { buf_element_t *buf; @@ -87,7 +87,7 @@ void xine_demux_flush_engine (xine_stream_t *stream) { /* on seeking we must wait decoder fifos to process before doing flush. * otherwise we flush too early (before the old data has left decoders) */ - xine_demux_control_headers_done (stream); + _x_demux_control_headers_done (stream); if (stream->video_out) { stream->video_out->flush(stream->video_out); @@ -101,7 +101,7 @@ void xine_demux_flush_engine (xine_stream_t *stream) { } -void xine_demux_control_newpts( xine_stream_t *stream, int64_t pts, uint32_t flags ) { +void _x_demux_control_newpts( xine_stream_t *stream, int64_t pts, uint32_t flags ) { buf_element_t *buf; @@ -121,7 +121,7 @@ void xine_demux_control_newpts( xine_stream_t *stream, int64_t pts, uint32_t fla } /* sync with decoder fifos, making sure everything gets processed */ -void xine_demux_control_headers_done (xine_stream_t *stream) { +void _x_demux_control_headers_done (xine_stream_t *stream) { int header_count_audio; int header_count_video; @@ -164,7 +164,7 @@ void xine_demux_control_headers_done (xine_stream_t *stream) { pthread_mutex_unlock (&stream->counter_lock); } -void xine_demux_control_start( xine_stream_t *stream ) { +void _x_demux_control_start( xine_stream_t *stream ) { buf_element_t *buf; @@ -179,7 +179,7 @@ void xine_demux_control_start( xine_stream_t *stream ) { } } -void xine_demux_control_end( xine_stream_t *stream, uint32_t flags ) { +void _x_demux_control_end( xine_stream_t *stream, uint32_t flags ) { buf_element_t *buf; @@ -196,7 +196,7 @@ void xine_demux_control_end( xine_stream_t *stream, uint32_t flags ) { } } -void xine_demux_control_nop( xine_stream_t *stream, uint32_t flags ) { +void _x_demux_control_nop( xine_stream_t *stream, uint32_t flags ) { buf_element_t *buf; @@ -251,7 +251,7 @@ static void *demux_loop (void *stream_gen) { /* tell to the net_buf_ctrl that we are at the end of the stream * then the net_buf_ctrl will not pause */ - xine_demux_control_nop(stream, BUF_FLAG_END_STREAM); + _x_demux_control_nop(stream, BUF_FLAG_END_STREAM); /* wait before sending end buffers: user might want to do a new seek */ while(stream->demux_thread_running && @@ -273,9 +273,9 @@ static void *demux_loop (void *stream_gen) { /* demux_thread_running is zero if demux loop has being stopped by user */ if (stream->demux_thread_running) { - xine_demux_control_end(stream, BUF_FLAG_END_STREAM); + _x_demux_control_end(stream, BUF_FLAG_END_STREAM); } else { - xine_demux_control_end(stream, BUF_FLAG_END_USER); + _x_demux_control_end(stream, BUF_FLAG_END_USER); } stream->demux_thread_running = 0; @@ -285,7 +285,7 @@ static void *demux_loop (void *stream_gen) { return NULL; } -int xine_demux_start_thread (xine_stream_t *stream) { +int _x_demux_start_thread (xine_stream_t *stream) { int err; @@ -312,7 +312,7 @@ int xine_demux_start_thread (xine_stream_t *stream) { return 0; } -int xine_demux_stop_thread (xine_stream_t *stream) { +int _x_demux_stop_thread (xine_stream_t *stream) { void *p; @@ -354,7 +354,7 @@ int xine_demux_stop_thread (xine_stream_t *stream) { return 0; } -int xine_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t size){ +int _x_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t size){ int read_size; unsigned char *buf; @@ -377,7 +377,7 @@ int xine_demux_read_header( input_plugin_t *input, unsigned char *buffer, off_t return read_size; } -int xine_demux_check_extension (char *mrl, char *extensions){ +int _x_demux_check_extension (char *mrl, char *extensions){ char *last_dot, *e, *ext_copy, *ext_work; ext_copy = strdup(extensions); @@ -406,7 +406,7 @@ int xine_demux_check_extension (char *mrl, char *extensions){ * * aborts with zero if no data is available and demux_action_pending is set */ -off_t xine_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) { +off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) { off_t ret, total; @@ -448,14 +448,14 @@ off_t xine_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) { if(errno == EAGAIN) continue; - perror("xine_read_abort"); + perror("_x_read_abort"); return ret; } #else ret = recv (fd, &buf[total], todo - total, 0); if (ret <= 0) { - perror("xine_read_abort"); + perror("_x_read_abort"); return ret; } #endif diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c index a5f80a989..cc5b86ab0 100644 --- a/src/xine-engine/input_rip.c +++ b/src/xine-engine/input_rip.c @@ -29,7 +29,7 @@ * - it's possible speeder saving streams in the xine without playing: * xine stream_mrl#save:file.raw\;noaudio\;novideo * - * $Id: input_rip.c,v 1.13 2003/11/08 22:12:13 miguelfreitas Exp $ + * $Id: input_rip.c,v 1.14 2003/11/11 18:45:00 f1rmb Exp $ */ /* TODO: @@ -519,7 +519,7 @@ static int dir_file_concat(char *target, size_t maxlen, const char *dir, const c * create self instance, * target file for writing stream is specified in 'data' */ -input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *filename) { +input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename) { rip_input_plugin_t *this; input_plugin_t *main_plugin = stream->input_plugin; struct stat pstat; @@ -527,7 +527,7 @@ input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *file char target[MAX_TARGET_LEN]; char *fnc; - lprintf("rip_plugin_get_instance(catch file = %s), path = %s\n", filename ? filename : "(null)", stream->xine->save_path); + lprintf("_x_rip_plugin_get_instance(catch file = %s), path = %s\n", filename ? filename : "(null)", stream->xine->save_path); /* check given input plugin */ if (!stream->input_plugin) { @@ -539,7 +539,7 @@ input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *file if (!stream->xine->save_path[0]) { xine_log(stream->xine, XINE_LOG_MSG, _("input_rip: target directory wasn't specified, please fill out the option 'misc.save_dir'\n")); - xine_message(stream, XINE_MSG_SECURITY, + _x_message(stream, XINE_MSG_SECURITY, _("The stream save feature is disabled until you set misc.save_dir in the configuration.")); return NULL; } @@ -548,7 +548,7 @@ input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *file if ( main_plugin->get_capabilities(main_plugin) & INPUT_CAP_RIP_FORBIDDEN ) { xine_log(stream->xine, XINE_LOG_MSG, _("input_rip: ripping/caching of this source is not permitted!\n")); - xine_message(stream, XINE_MSG_SECURITY, + _x_message(stream, XINE_MSG_SECURITY, _("xine is not allowed to save from this source. (possibly copyrighted material?)")); return NULL; } diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c index 0ed24e543..406a3ad4b 100644 --- a/src/xine-engine/io_helper.c +++ b/src/xine-engine/io_helper.c @@ -46,26 +46,26 @@ #ifndef ENABLE_IPV6 -static int xio_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int port) { +static int _x_io_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int port) { struct hostent *h; int i, s; h = gethostbyname(host); if (h == NULL) { - xine_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL); + _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL); return -1; } s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (s == -1) { - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL); + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL); return -1; } #ifndef _MSC_VER if (fcntl (s, F_SETFL, fcntl (s, F_GETFL) | O_NONBLOCK) == -1) { - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL); + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL); return -1; } #else @@ -76,7 +76,7 @@ static int xio_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int por rc = ioctlsocket(s, FIONBIO, &non_block); if (rc == SOCKET_ERROR) { - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL); + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "can't put socket in non-blocking mode", strerror(errno), NULL); return -1; } } @@ -98,7 +98,7 @@ static int xio_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int por printf("io_helper: WSAGetLastError() = %d\n", WSAGetLastError()); #endif /* WIN32 */ - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL); + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(errno), NULL); close(s); continue; } @@ -109,10 +109,10 @@ static int xio_tcp_connect_ipv4(xine_stream_t *stream, const char *host, int por } #endif -int xio_tcp_connect(xine_stream_t *stream, const char *host, int port) { +int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port) { #ifndef ENABLE_IPV6 - return xio_tcp_connect_ipv4(stream, host, port); + return _x_io_tcp_connect_ipv4(stream, host, port); #else int s; struct addrinfo hints, *res, *tmpaddr; @@ -130,7 +130,7 @@ int xio_tcp_connect(xine_stream_t *stream, const char *host, int port) { error = getaddrinfo(host, strport, &hints, &res); if (error) { - xine_message(stream, XINE_MSG_UNKNOWN_HOST, + _x_message(stream, XINE_MSG_UNKNOWN_HOST, "unable to resolve", host, NULL); return -1; } @@ -141,7 +141,7 @@ int xio_tcp_connect(xine_stream_t *stream, const char *host, int port) { s = socket(tmpaddr->ai_family, SOCK_STREAM, IPPROTO_TCP); if (s == -1) { - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, "failed to create socket", strerror(errno), NULL); tmpaddr = tmpaddr->ai_next; continue; @@ -179,14 +179,14 @@ int xio_tcp_connect(xine_stream_t *stream, const char *host, int port) { tmpaddr = tmpaddr->ai_next; } - xine_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), NULL); + _x_message(stream, XINE_MSG_CONNECTION_REFUSED, strerror(error), NULL); return -1; #endif } -int xio_select (xine_stream_t *stream, int fd, int state, int timeout_msec) { +int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec) { fd_set fdset; fd_set *rset, *wset; @@ -245,7 +245,7 @@ static off_t xio_rw_abort(xine_stream_t *stream, int fd, int cmd, char *buf, off while (total < todo) { do { - sret = xio_select(stream, fd, state, 500); /* 500 ms */ + sret = _x_io_select(stream, fd, state, 500); /* 500 ms */ } while (sret == XIO_TIMEOUT); if (sret != XIO_READY) @@ -292,18 +292,18 @@ static off_t xio_rw_abort(xine_stream_t *stream, int fd, int cmd, char *buf, off return total; } -off_t xio_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo) { +off_t _x_io_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo) { return xio_rw_abort (stream, s, XIO_TCP_READ, buf, todo); } -off_t xio_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo) { +off_t _x_io_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo) { return xio_rw_abort (stream, s, XIO_TCP_WRITE, buf, todo); } -off_t xio_file_read (xine_stream_t *stream, int s, char *buf, off_t todo) { +off_t _x_io_file_read (xine_stream_t *stream, int s, char *buf, off_t todo) { return xio_rw_abort (stream, s, XIO_FILE_READ, buf, todo); } -off_t xio_file_write (xine_stream_t *stream, int s, char *buf, off_t todo) { +off_t _x_io_file_write (xine_stream_t *stream, int s, char *buf, off_t todo) { return xio_rw_abort (stream, s, XIO_FILE_WRITE, buf, todo); } diff --git a/src/xine-engine/io_helper.h b/src/xine-engine/io_helper.h index 45624eab2..e352b474a 100644 --- a/src/xine-engine/io_helper.h +++ b/src/xine-engine/io_helper.h @@ -55,7 +55,7 @@ * XIO_ABORTED command aborted by an other thread * XIO_TIMEOUT the file descriptor is not ready after timeout_msec milliseconds */ -int xio_select (xine_stream_t *stream, int fd, int state, int timeout_msec); +int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec); /* @@ -63,7 +63,7 @@ int xio_select (xine_stream_t *stream, int fd, int state, int timeout_msec); * * returns a socket descriptor or -1 if an error occured */ -int xio_tcp_connect(xine_stream_t *stream, const char *host, int port); +int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port); /* * read from tcp socket checking demux_action_pending @@ -73,7 +73,7 @@ int xio_tcp_connect(xine_stream_t *stream, const char *host, int port); * * aborts with zero if no data is available and *abort is set */ -off_t xio_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo); +off_t _x_io_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo); /* @@ -84,7 +84,7 @@ off_t xio_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo); * * aborts with zero if no data is available and *abort is set */ -off_t xio_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo); +off_t _x_io_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo); /* * read from a file descriptor checking demux_action_pending @@ -94,7 +94,7 @@ off_t xio_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo); * * aborts with zero if no data is available and *abort is set */ -off_t xio_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo); +off_t _x_io_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo); /* @@ -105,6 +105,6 @@ off_t xio_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo); * * aborts with zero if *abort is set */ -off_t xio_file_write (xine_stream_t *stream, int fd, char *buf, off_t todo); +off_t _x_io_file_write (xine_stream_t *stream, int fd, char *buf, off_t todo); #endif diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 2aafe4e57..c8a02a802 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: load_plugins.c,v 1.161 2003/11/02 23:05:55 f1rmb Exp $ + * $Id: load_plugins.c,v 1.162 2003/11/11 18:45:00 f1rmb Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -962,7 +962,7 @@ static void map_decoders (xine_t *this) { /* * initialize catalog, load all plugins into new catalog */ -void scan_plugins (xine_t *this) { +void _x_scan_plugins (xine_t *this) { const char *homedir; char *plugindir; @@ -971,7 +971,7 @@ void scan_plugins (xine_t *this) { int lenpluginpath; #ifdef LOG - printf("load_plugins: scan_plugins()\n"); + printf("load_plugins: _x_scan_plugins()\n"); #endif /* TODO - This needs to be fixed for WIN32 */ @@ -1028,7 +1028,7 @@ void scan_plugins (xine_t *this) { * input / demuxer plugin loading */ -input_plugin_t *find_input_plugin (xine_stream_t *stream, const char *mrl) { +input_plugin_t *_x_find_input_plugin (xine_stream_t *stream, const char *mrl) { xine_t *xine = stream->xine; plugin_catalog_t *catalog = xine->plugin_catalog; @@ -1103,7 +1103,7 @@ static demux_plugin_t *probe_demux (xine_stream_t *stream, int method1, int meth return NULL; } -demux_plugin_t *find_demux_plugin (xine_stream_t *stream, input_plugin_t *input) { +demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *input) { switch (stream->xine->demux_strategy) { @@ -1128,7 +1128,7 @@ demux_plugin_t *find_demux_plugin (xine_stream_t *stream, input_plugin_t *input) return NULL; } -demux_plugin_t *find_demux_plugin_by_name(xine_stream_t *stream, const char *name, input_plugin_t *input) { +demux_plugin_t *_x_find_demux_plugin_by_name(xine_stream_t *stream, const char *name, input_plugin_t *input) { plugin_catalog_t *catalog = stream->xine->plugin_catalog; plugin_node_t *node; @@ -1161,7 +1161,7 @@ demux_plugin_t *find_demux_plugin_by_name(xine_stream_t *stream, const char *nam * known stream. */ -demux_plugin_t *find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input) { +demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input) { int i; int methods[3]; @@ -1391,7 +1391,7 @@ xine_video_port_t *xine_open_video_driver (xine_t *this, return NULL; } - port = vo_new_port(this, driver, 0); + port = _x_vo_new_port(this, driver, 0); return port; } @@ -1428,7 +1428,7 @@ xine_video_port_t *xine_new_framegrab_video_port (xine_t *this) { return NULL; } - port = vo_new_port(this, driver, 1); + port = _x_vo_new_port(this, driver, 1); return port; } @@ -1533,7 +1533,7 @@ xine_audio_port_t *xine_open_audio_driver (xine_t *this, const char *id, return NULL; } - port = ao_new_port(this, driver, 0); + port = _x_ao_new_port(this, driver, 0); return port; } @@ -1542,7 +1542,7 @@ xine_audio_port_t *xine_new_framegrab_audio_port (xine_t *this) { xine_audio_port_t *port; - port = ao_new_port (this, NULL, 1); + port = _x_ao_new_port (this, NULL, 1); return port; } @@ -1616,7 +1616,7 @@ xine_mrl_t **xine_get_browse_mrls (xine_t *this, const char *plugin_id, return NULL; } -video_decoder_t *get_video_decoder (xine_stream_t *stream, uint8_t stream_type) { +video_decoder_t *_x_get_video_decoder (xine_stream_t *stream, uint8_t stream_type) { plugin_node_t *node; int i, j; @@ -1680,7 +1680,7 @@ video_decoder_t *get_video_decoder (xine_stream_t *stream, uint8_t stream_type) return NULL; } -void free_video_decoder (xine_stream_t *stream, video_decoder_t *vd) { +void _x_free_video_decoder (xine_stream_t *stream, video_decoder_t *vd) { plugin_catalog_t *catalog = stream->xine->plugin_catalog; plugin_node_t *node = vd->node; @@ -1695,7 +1695,7 @@ void free_video_decoder (xine_stream_t *stream, video_decoder_t *vd) { } -audio_decoder_t *get_audio_decoder (xine_stream_t *stream, uint8_t stream_type) { +audio_decoder_t *_x_get_audio_decoder (xine_stream_t *stream, uint8_t stream_type) { plugin_node_t *node; int i, j; @@ -1756,7 +1756,7 @@ audio_decoder_t *get_audio_decoder (xine_stream_t *stream, uint8_t stream_type) return NULL; } -void free_audio_decoder (xine_stream_t *stream, audio_decoder_t *ad) { +void _x_free_audio_decoder (xine_stream_t *stream, audio_decoder_t *ad) { plugin_catalog_t *catalog = stream->xine->plugin_catalog; plugin_node_t *node = ad->node; @@ -1771,7 +1771,7 @@ void free_audio_decoder (xine_stream_t *stream, audio_decoder_t *ad) { } -spu_decoder_t *get_spu_decoder (xine_stream_t *stream, uint8_t stream_type) { +spu_decoder_t *_x_get_spu_decoder (xine_stream_t *stream, uint8_t stream_type) { plugin_node_t *node; int i, j; @@ -1831,7 +1831,7 @@ spu_decoder_t *get_spu_decoder (xine_stream_t *stream, uint8_t stream_type) { return NULL; } -void free_spu_decoder (xine_stream_t *stream, spu_decoder_t *sd) { +void _x_free_spu_decoder (xine_stream_t *stream, spu_decoder_t *sd) { plugin_catalog_t *catalog = stream->xine->plugin_catalog; plugin_node_t *node = sd->node; @@ -2259,7 +2259,7 @@ static void dispose_plugin_list (xine_list_t *list) { * dispose all currently loaded plugins (shutdown) */ -void dispose_plugins (xine_t *this) { +void _x_dispose_plugins (xine_t *this) { if(this->plugin_catalog) { dispose_plugin_list (this->plugin_catalog->input); diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c index eddcb08f4..df2c8842c 100644 --- a/src/xine-engine/metronom.c +++ b/src/xine-engine/metronom.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.c,v 1.124 2003/10/31 17:41:07 mroi Exp $ + * $Id: metronom.c,v 1.125 2003/11/11 18:45:00 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -796,7 +796,7 @@ static void metronom_clock_exit (metronom_clock_t *this) { } -metronom_t * metronom_init (int have_audio, xine_stream_t *stream) { +metronom_t * _x_metronom_init (int have_audio, xine_stream_t *stream) { metronom_t *this = xine_xmalloc (sizeof (metronom_t)); @@ -844,7 +844,7 @@ metronom_t * metronom_init (int have_audio, xine_stream_t *stream) { } -metronom_clock_t *metronom_clock_init(void) +metronom_clock_t *_x_metronom_clock_init(void) { metronom_clock_t *this = (metronom_clock_t *)malloc(sizeof(metronom_clock_t)); int err; diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h index e7ee091c0..2858f2586 100644 --- a/src/xine-engine/metronom.h +++ b/src/xine-engine/metronom.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: metronom.h,v 1.51 2003/09/13 15:31:53 miguelfreitas Exp $ + * $Id: metronom.h,v 1.52 2003/11/11 18:45:00 f1rmb Exp $ * * metronom: general pts => virtual calculation/assoc * @@ -226,7 +226,7 @@ struct metronom_s { #define METRONOM_SPU_OFFSET 5 #define METRONOM_VPTS_OFFSET 6 -metronom_t *metronom_init (int have_audio, xine_stream_t *stream); +metronom_t *_x_metronom_init (int have_audio, xine_stream_t *stream); struct metronom_clock_s { @@ -299,7 +299,7 @@ struct metronom_clock_s { }; -metronom_clock_t *metronom_clock_init(void); +metronom_clock_t *_x_metronom_clock_init(void); /* * clock options diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c index 2df12d51f..17c97d50b 100644 --- a/src/xine-engine/osd.c +++ b/src/xine-engine/osd.c @@ -1247,7 +1247,7 @@ static void osd_draw_bitmap(osd_object_t *osd, uint8_t *bitmap, * initialize the osd rendering engine */ -osd_renderer_t *osd_renderer_init( video_overlay_manager_t *video_overlay, config_values_t *config ) { +osd_renderer_t *_x_osd_renderer_init( video_overlay_manager_t *video_overlay, config_values_t *config ) { osd_renderer_t *this; char str[1024]; @@ -1260,7 +1260,7 @@ osd_renderer_t *osd_renderer_init( video_overlay_manager_t *video_overlay, confi pthread_mutex_init (&this->osd_mutex, NULL); #ifdef LOG_DEBUG - printf("osd: osd_renderer_init %p\n", this); + printf("osd: _x_osd_renderer_init %p\n", this); #endif /* diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h index b38522891..fd6a30862 100644 --- a/src/xine-engine/osd.h +++ b/src/xine-engine/osd.h @@ -18,7 +18,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * * OSD stuff (text and graphic primitives) - * $Id: osd.h,v 1.18 2003/09/18 18:14:51 valtri Exp $ + * $Id: osd.h,v 1.19 2003/11/11 18:45:01 f1rmb Exp $ */ #ifndef HAVE_OSD_H @@ -217,7 +217,7 @@ struct osd_renderer_s { /* * initialize the osd rendering engine */ -osd_renderer_t *osd_renderer_init( video_overlay_manager_t *video_overlay, config_values_t *config ); +osd_renderer_t *_x_osd_renderer_init( video_overlay_manager_t *video_overlay, config_values_t *config ); /* diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h index f96e7b1d2..43352992b 100644 --- a/src/xine-engine/plugin_catalog.h +++ b/src/xine-engine/plugin_catalog.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: plugin_catalog.h,v 1.12 2003/05/20 13:50:56 mroi Exp $ + * $Id: plugin_catalog.h,v 1.13 2003/11/11 18:45:01 f1rmb Exp $ * * xine-internal header: Definitions for plugin lists * @@ -82,13 +82,13 @@ typedef struct plugin_catalog_s plugin_catalog_t; * decoder plugins are loaded on demand * video/audio output plugins have special load/probe functions */ -void scan_plugins (xine_t *this); +void _x_scan_plugins (xine_t *this); /* * dispose all currently loaded plugins (shutdown) */ -void dispose_plugins (xine_t *this); +void _x_dispose_plugins (xine_t *this); #endif diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c index c00b47d28..f9b753583 100644 --- a/src/xine-engine/post.c +++ b/src/xine-engine/post.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: post.c,v 1.17 2003/10/23 15:17:07 mroi Exp $ + * $Id: post.c,v 1.18 2003/11/11 18:45:01 f1rmb Exp $ */ /* @@ -91,7 +91,7 @@ static int post_video_set_property(xine_video_port_t *port_gen, int property, in return port->original_port->set_property(port->original_port, property, value); } -post_video_port_t *post_intercept_video_port(post_plugin_t *post, xine_video_port_t *original) { +post_video_port_t *_x_post_intercept_video_port(post_plugin_t *post, xine_video_port_t *original) { post_video_port_t *post_port = (post_video_port_t *)malloc(sizeof(post_video_port_t)); if (!post_port) @@ -121,7 +121,7 @@ post_video_port_t *post_intercept_video_port(post_plugin_t *post, xine_video_por /* dummy intercept functions for frames */ static void post_frame_free(vo_frame_t *vo_img) { post_video_port_t *port = (post_video_port_t *)vo_img->port; - post_restore_video_frame(vo_img, port); + _x_post_restore_video_frame(vo_img, port); vo_img->free(vo_img); } @@ -148,19 +148,19 @@ static void post_frame_field(vo_frame_t *vo_img, int which_field) { static int post_frame_draw(vo_frame_t *vo_img, xine_stream_t *stream) { post_video_port_t *port = (post_video_port_t *)vo_img->port; - post_restore_video_frame(vo_img, port); + _x_post_restore_video_frame(vo_img, port); return vo_img->draw(vo_img, stream); } static void post_frame_lock(vo_frame_t *vo_img) { post_video_port_t *port = (post_video_port_t *)vo_img->port; - post_restore_video_frame(vo_img, port); + _x_post_restore_video_frame(vo_img, port); vo_img->lock(vo_img); } static void post_frame_dispose(vo_frame_t *vo_img) { post_video_port_t *port = (post_video_port_t *)vo_img->port; - post_restore_video_frame(vo_img, port); + _x_post_restore_video_frame(vo_img, port); vo_img->dispose(vo_img); } @@ -180,9 +180,9 @@ static void post_frame_proc_macro_block(int x, int (*f_mot_pmv)[2], int (*b_mot_pmv)[2]) { post_video_port_t *port = (post_video_port_t *)current_frame->port; - post_restore_video_frame(current_frame, port); - post_restore_video_frame(forward_ref_frame, port); - post_restore_video_frame(backward_ref_frame, port); + _x_post_restore_video_frame(current_frame, port); + _x_post_restore_video_frame(forward_ref_frame, port); + _x_post_restore_video_frame(backward_ref_frame, port); current_frame->proc_macro_block(x, y, mb_type, motion_type, mv_field_sel, dmvector, cbp, dct_type, current_frame, forward_ref_frame, backward_ref_frame, @@ -192,7 +192,7 @@ static void post_frame_proc_macro_block(int x, -void post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port) { +void _x_post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port) { port->original_frame.port = frame->port; port->original_frame.free = frame->free; port->original_frame.proc_slice = frame->proc_slice; @@ -214,7 +214,7 @@ void post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port) { frame->dispose = post_frame_dispose; } -void post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port) { +void _x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port) { frame->port = port->original_port; frame->free = port->original_frame.free; frame->proc_slice = port->original_frame.proc_slice; @@ -270,7 +270,7 @@ static void post_overlay_multiple_overlay_blend(video_overlay_manager_t *ovl_gen } -post_overlay_manager_t *post_intercept_overlay_manager(post_plugin_t *post, +post_overlay_manager_t *_x_post_intercept_overlay_manager(post_plugin_t *post, video_overlay_manager_t *original) { post_overlay_manager_t *post_ovl = (post_overlay_manager_t *)malloc(sizeof(post_overlay_manager_t)); @@ -362,7 +362,7 @@ static int post_audio_status(xine_audio_port_t *port_gen, xine_stream_t *stream, } -post_audio_port_t *post_intercept_audio_port(post_plugin_t *post, xine_audio_port_t *original) { +post_audio_port_t *_x_post_intercept_audio_port(post_plugin_t *post, xine_audio_port_t *original) { post_audio_port_t *post_port = (post_audio_port_t *)malloc(sizeof(post_audio_port_t)); if (!post_port) diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h index b7c143c67..3d85aeb29 100644 --- a/src/xine-engine/post.h +++ b/src/xine-engine/post.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: post.h,v 1.13 2003/10/23 20:12:33 mroi Exp $ + * $Id: post.h,v 1.14 2003/11/11 18:45:01 f1rmb Exp $ * * post plugin definitions * @@ -132,12 +132,12 @@ struct post_video_port_s { /* use this to create a new, trivially decorated video port in which * port functions can be replaced with own implementations */ -post_video_port_t *post_intercept_video_port(post_plugin_t *post, xine_video_port_t *port); +post_video_port_t *_x_post_intercept_video_port(post_plugin_t *post, xine_video_port_t *port); /* use this to decorate and to undecorate a frame so that its functions * can be replaced with own implementations */ -void post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port); -void post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port); +void _x_post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port); +void _x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port); /* helper structure for intercepting overlay manager calls */ @@ -157,8 +157,8 @@ struct post_overlay_manager_s { /* use this to create a new, trivially decorated overlay manager in which * port functions can be replaced with own implementations */ -post_overlay_manager_t *post_intercept_overlay_manager(post_plugin_t *post, - video_overlay_manager_t *original); +post_overlay_manager_t *_x_post_intercept_overlay_manager(post_plugin_t *post, + video_overlay_manager_t *original); /* helper structure for intercepting audio port calls */ @@ -178,7 +178,7 @@ struct post_audio_port_s { /* use this to create a new, trivially decorated audio port in which * port functions can be replaced with own implementations */ -post_audio_port_t *post_intercept_audio_port(post_plugin_t *post, xine_audio_port_t *port); +post_audio_port_t *_x_post_intercept_audio_port(post_plugin_t *post, xine_audio_port_t *port); /* macros to create parameter descriptors */ diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c index a9de42e27..66d5af96b 100644 --- a/src/xine-engine/resample.c +++ b/src/xine-engine/resample.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: resample.c,v 1.6 2003/07/27 12:47:23 hadess Exp $ + * $Id: resample.c,v 1.7 2003/11/11 18:45:01 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -29,8 +29,8 @@ /* contributed by paul flinders */ -void audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples) +void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples) { int osample; /* 16+16 fixed point math */ @@ -60,8 +60,8 @@ void audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, output_samples[out_samples-1] = input_samples[in_samples-1]; } -void audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples) +void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples) { int osample; /* 16+16 fixed point math */ @@ -98,8 +98,8 @@ void audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, } -void audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples) +void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples) { int osample; /* 16+16 fixed point math */ @@ -152,8 +152,8 @@ void audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, } -void audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples) +void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples) { int osample; /* 16+16 fixed point math */ @@ -213,8 +213,8 @@ void audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, } -void audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples) +void _x_audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples) { int osample; /* 16+16 fixed point math */ @@ -280,8 +280,8 @@ void audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, output_samples[out_samples*6-1] = input_samples[in_samples*6-1]; } -void audio_out_resample_8to16(int8_t* input_samples, - int16_t* output_samples, uint32_t samples) +void _x_audio_out_resample_8to16(int8_t* input_samples, + int16_t* output_samples, uint32_t samples) { while( samples-- ) { int16_t os; @@ -292,8 +292,8 @@ void audio_out_resample_8to16(int8_t* input_samples, } } -void audio_out_resample_16to8(int16_t* input_samples, - int8_t* output_samples, uint32_t samples) +void _x_audio_out_resample_16to8(int16_t* input_samples, + int8_t* output_samples, uint32_t samples) { while( samples-- ) { int16_t os; @@ -304,8 +304,8 @@ void audio_out_resample_16to8(int16_t* input_samples, } } -void audio_out_resample_monotostereo(int16_t* input_samples, - int16_t* output_samples, uint32_t frames) +void _x_audio_out_resample_monotostereo(int16_t* input_samples, + int16_t* output_samples, uint32_t frames) { while( frames-- ) { int16_t os; @@ -316,8 +316,8 @@ void audio_out_resample_monotostereo(int16_t* input_samples, } } -void audio_out_resample_stereotomono(int16_t* input_samples, - int16_t* output_samples, uint32_t frames) +void _x_audio_out_resample_stereotomono(int16_t* input_samples, + int16_t* output_samples, uint32_t frames) { while( frames-- ) { int16_t os; diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h index 0706df8a3..dfdc0dc6b 100644 --- a/src/xine-engine/resample.h +++ b/src/xine-engine/resample.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: resample.h,v 1.3 2002/10/23 17:12:34 guenter Exp $ + * $Id: resample.h,v 1.4 2003/11/11 18:45:01 f1rmb Exp $ * * utilitiy functions for audio drivers * @@ -27,31 +27,31 @@ #ifndef HAVE_RESAMPLE_H #define HAVE_RESAMPLE_H -void audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples); +void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples); -void audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples); +void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples); -void audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples); +void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples); -void audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples); +void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples); -void audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, - int16_t* output_samples, uint32_t out_samples); +void _x_audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, + int16_t* output_samples, uint32_t out_samples); -void audio_out_resample_8to16(int8_t* input_samples, - int16_t* output_samples, uint32_t samples); +void _x_audio_out_resample_8to16(int8_t* input_samples, + int16_t* output_samples, uint32_t samples); -void audio_out_resample_16to8(int16_t* input_samples, - int8_t* output_samples, uint32_t samples); +void _x_audio_out_resample_16to8(int16_t* input_samples, + int8_t* output_samples, uint32_t samples); -void audio_out_resample_monotostereo(int16_t* input_samples, - int16_t* output_samples, uint32_t frames); +void _x_audio_out_resample_monotostereo(int16_t* input_samples, + int16_t* output_samples, uint32_t frames); -void audio_out_resample_stereotomono(int16_t* input_samples, - int16_t* output_samples, uint32_t frames); +void _x_audio_out_resample_stereotomono(int16_t* input_samples, + int16_t* output_samples, uint32_t frames); #endif diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c index f607ae7ef..55cd0d281 100644 --- a/src/xine-engine/scratch.c +++ b/src/xine-engine/scratch.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: scratch.c,v 1.9 2002/10/23 17:12:34 guenter Exp $ + * $Id: scratch.c,v 1.10 2003/11/11 18:45:01 f1rmb Exp $ * * top-level xine functions * @@ -85,7 +85,7 @@ static void scratch_dispose (scratch_buffer_t *this) { } -scratch_buffer_t *new_scratch_buffer (int num_lines) { +scratch_buffer_t *_x_new_scratch_buffer (int num_lines) { scratch_buffer_t *this; int i; diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h index cd24f7432..e79fe6b4b 100644 --- a/src/xine-engine/scratch.h +++ b/src/xine-engine/scratch.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: scratch.h,v 1.5 2002/10/23 17:12:34 guenter Exp $ + * $Id: scratch.h,v 1.6 2003/11/11 18:45:01 f1rmb Exp $ * * scratch buffer for log output * @@ -46,6 +46,6 @@ struct scratch_buffer_s { }; -scratch_buffer_t *new_scratch_buffer (int num_lines); +scratch_buffer_t *_x_new_scratch_buffer (int num_lines); #endif diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index 4a96fc827..e21d301e6 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.136 2003/07/27 12:47:23 hadess Exp $ + * $Id: video_decoder.c,v 1.137 2003/11/11 18:45:01 f1rmb Exp $ * */ @@ -45,10 +45,10 @@ static void update_spu_decoder (xine_stream_t *stream, int type) { !stream->spu_decoder_plugin ) { if (stream->spu_decoder_plugin) - free_spu_decoder (stream, stream->spu_decoder_plugin); + _x_free_spu_decoder (stream, stream->spu_decoder_plugin); stream->spu_decoder_streamtype = streamtype; - stream->spu_decoder_plugin = get_spu_decoder (stream, streamtype); + stream->spu_decoder_plugin = _x_get_spu_decoder (stream, streamtype); } return ; @@ -76,7 +76,7 @@ static void *video_decoder_loop (void *stream_gen) { #endif buf = stream->video_fifo->get (stream->video_fifo); - extra_info_merge( stream->video_decoder_extra_info, buf->extra_info ); + _x_extra_info_merge( stream->video_decoder_extra_info, buf->extra_info ); stream->video_decoder_extra_info->seek_count = stream->video_seek_count; #ifdef LOG @@ -112,12 +112,12 @@ static void *video_decoder_loop (void *stream_gen) { case BUF_CONTROL_START: if (stream->video_decoder_plugin) { - free_video_decoder (stream, stream->video_decoder_plugin); + _x_free_video_decoder (stream, stream->video_decoder_plugin); stream->video_decoder_plugin = NULL; } if (stream->spu_decoder_plugin) { - free_spu_decoder (stream, stream->spu_decoder_plugin); + _x_free_spu_decoder (stream, stream->spu_decoder_plugin); stream->spu_decoder_plugin = NULL; stream->spu_track_map_entries = 0; } @@ -180,7 +180,7 @@ static void *video_decoder_loop (void *stream_gen) { pthread_mutex_unlock (&stream->counter_lock); /* set engine status, send frontend notification event */ - xine_handle_stream_end (stream, buf->decoder_flags & BUF_FLAG_END_STREAM); + _x_handle_stream_end (stream, buf->decoder_flags & BUF_FLAG_END_STREAM); /* Wake up xine_play if it's waiting for a frame */ pthread_mutex_lock (&stream->first_frame_lock); @@ -194,11 +194,11 @@ static void *video_decoder_loop (void *stream_gen) { case BUF_CONTROL_QUIT: if (stream->video_decoder_plugin) { - free_video_decoder (stream, stream->video_decoder_plugin); + _x_free_video_decoder (stream, stream->video_decoder_plugin); stream->video_decoder_plugin = NULL; } if (stream->spu_decoder_plugin) { - free_spu_decoder (stream, stream->spu_decoder_plugin); + _x_free_spu_decoder (stream, stream->spu_decoder_plugin); stream->spu_decoder_plugin = NULL; stream->spu_track_map_entries = 0; } @@ -207,7 +207,7 @@ static void *video_decoder_loop (void *stream_gen) { break; case BUF_CONTROL_RESET_DECODER: - extra_info_reset( stream->video_decoder_extra_info ); + _x_extra_info_reset( stream->video_decoder_extra_info ); stream->video_seek_count++; if (stream->video_decoder_plugin) { @@ -292,11 +292,11 @@ static void *video_decoder_loop (void *stream_gen) { !stream->video_decoder_plugin) ) { if (stream->video_decoder_plugin) { - free_video_decoder (stream, stream->video_decoder_plugin); + _x_free_video_decoder (stream, stream->video_decoder_plugin); } stream->video_decoder_streamtype = streamtype; - stream->video_decoder_plugin = get_video_decoder (stream, streamtype); + stream->video_decoder_plugin = _x_get_video_decoder (stream, streamtype); stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = (stream->video_decoder_plugin != NULL); @@ -309,17 +309,17 @@ static void *video_decoder_loop (void *stream_gen) { !stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED]) { xine_log (stream->xine, XINE_LOG_MSG, "video_decoder: no plugin available to handle '%s'\n", - buf_video_name( buf->type ) ); + _x_buf_video_name( buf->type ) ); if( !stream->meta_info[XINE_META_INFO_VIDEOCODEC] ) stream->meta_info[XINE_META_INFO_VIDEOCODEC] - = strdup (buf_video_name( buf->type )); + = strdup (_x_buf_video_name( buf->type )); buftype_unknown = buf->type; /* fatal error - dispose plugin */ if (stream->video_decoder_plugin) { - free_video_decoder (stream, stream->video_decoder_plugin); + _x_free_video_decoder (stream, stream->video_decoder_plugin); stream->video_decoder_plugin = NULL; } } @@ -390,7 +390,7 @@ static void *video_decoder_loop (void *stream_gen) { return NULL; } -void video_decoder_init (xine_stream_t *stream) { +void _x_video_decoder_init (xine_stream_t *stream) { pthread_attr_t pth_attrs; struct sched_param pth_params; @@ -412,7 +412,7 @@ void video_decoder_init (xine_stream_t *stream) { NULL, NULL); - stream->video_fifo = fifo_buffer_new (num_buffers, 8192); + stream->video_fifo = _x_fifo_buffer_new (num_buffers, 8192); stream->spu_track_map_entries = 0; pthread_attr_init(&pth_attrs); @@ -431,7 +431,7 @@ void video_decoder_init (xine_stream_t *stream) { pthread_attr_destroy(&pth_attrs); } -void video_decoder_shutdown (xine_stream_t *stream) { +void _x_video_decoder_shutdown (xine_stream_t *stream) { buf_element_t *buf; void *p; diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index edee8b9c8..ea4f30c84 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.c,v 1.176 2003/10/30 22:40:53 mroi Exp $ + * $Id: video_out.c,v 1.177 2003/11/11 18:45:01 f1rmb Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -303,7 +303,7 @@ static vo_frame_t *vo_get_frame (xine_video_port_t *this_gen, img->repeat_first_field = 0; img->top_field_first = 1; img->macroblocks = NULL; - extra_info_reset ( img->extra_info ); + _x_extra_info_reset ( img->extra_info ); /* let driver ensure this image has the right format */ @@ -332,7 +332,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) { this->current_height = img->height; if (stream) { - extra_info_merge( img->extra_info, stream->video_decoder_extra_info ); + _x_extra_info_merge( img->extra_info, stream->video_decoder_extra_info ); stream->metronom->got_video_frame (stream->metronom, img); } this->current_duration = img->duration; @@ -436,7 +436,7 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) { #endif if (stream) { pthread_mutex_lock( &stream->current_extra_info_lock ); - extra_info_merge( stream->current_extra_info, img->extra_info ); + _x_extra_info_merge( stream->current_extra_info, img->extra_info ); pthread_mutex_unlock( &stream->current_extra_info_lock ); } @@ -637,7 +637,7 @@ static void expire_frames (vos_t *this, int64_t cur_vpts) { if (img->stream) { pthread_mutex_lock( &img->stream->current_extra_info_lock ); - extra_info_merge( img->stream->current_extra_info, img->extra_info ); + _x_extra_info_merge( img->stream->current_extra_info, img->extra_info ); pthread_mutex_unlock( &img->stream->current_extra_info_lock ); } @@ -719,7 +719,7 @@ static vo_frame_t *get_next_frame (vos_t *this, int64_t cur_vpts) { if( img ) { img->vpts = cur_vpts; /* extra info of the backup is thrown away, because it is not up to date */ - extra_info_reset(img->extra_info); + _x_extra_info_reset(img->extra_info); } return img; @@ -810,7 +810,7 @@ static void overlay_and_display_frame (vos_t *this, pthread_mutex_lock( &img->stream->current_extra_info_lock ); diff = img->extra_info->vpts - img->stream->current_extra_info->vpts; if ((diff > 3000) || (diff<-300000)) - extra_info_merge( img->stream->current_extra_info, img->extra_info ); + _x_extra_info_merge( img->stream->current_extra_info, img->extra_info ); pthread_mutex_unlock( &img->stream->current_extra_info_lock ); } @@ -898,7 +898,7 @@ static void paused_loop( vos_t *this, int64_t vpts ) img = duplicate_frame (this, this->img_backup ); if( img ) { /* extra info of the backup is thrown away, because it is not up to date */ - extra_info_reset(img->extra_info); + _x_extra_info_reset(img->extra_info); pthread_mutex_unlock( &this->free_img_buf_queue->mutex ); overlay_and_display_frame (this, img, vpts); pthread_mutex_lock( &this->free_img_buf_queue->mutex ); @@ -1460,7 +1460,7 @@ static void vo_flush (xine_video_port_t *this_gen) { } } -xine_video_port_t *vo_new_port (xine_t *xine, vo_driver_t *driver, +xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) { vos_t *this; @@ -1504,7 +1504,7 @@ xine_video_port_t *vo_new_port (xine_t *xine, vo_driver_t *driver, this->last_frame = NULL; this->img_backup = NULL; - this->overlay_source = video_overlay_new_manager(); + this->overlay_source = _x_video_overlay_new_manager(); this->overlay_source->init (this->overlay_source); this->overlay_enabled = 1; diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 3d84b933a..44fe4aa92 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_out.h,v 1.100 2003/10/30 22:40:53 mroi Exp $ + * $Id: video_out.h,v 1.101 2003/11/11 18:45:01 f1rmb Exp $ * * * xine version of video_out.h @@ -472,14 +472,11 @@ struct video_overlay_manager_s { vo_driver_t *output, vo_frame_t *vo_img, int enabled); }; -video_overlay_manager_t *video_overlay_new_instance (void); - - /* * build a video_out_port from * a given video driver */ -xine_video_port_t *vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) ; +xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) ; #ifdef __cplusplus } diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c index cfe8c19d5..f8b05589c 100644 --- a/src/xine-engine/video_overlay.c +++ b/src/xine-engine/video_overlay.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_overlay.c,v 1.31 2003/08/25 21:51:52 f1rmb Exp $ + * $Id: video_overlay.c,v 1.32 2003/11/11 18:45:01 f1rmb Exp $ * */ @@ -575,7 +575,7 @@ static void video_overlay_dispose(video_overlay_manager_t *this_gen) { } -video_overlay_manager_t *video_overlay_new_manager (void) { +video_overlay_manager_t *_x_video_overlay_new_manager (void) { video_overlay_t *this; diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h index b27b72ef3..fbe133c75 100644 --- a/src/xine-engine/video_overlay.h +++ b/src/xine-engine/video_overlay.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_overlay.h,v 1.15 2003/08/25 21:51:52 f1rmb Exp $ + * $Id: video_overlay.h,v 1.16 2003/11/11 18:45:01 f1rmb Exp $ * */ @@ -101,6 +101,6 @@ typedef struct video_overlay_event_s { video_overlay_object_t object; /* The image data. */ } video_overlay_event_t; -video_overlay_manager_t *video_overlay_new_manager(void); +video_overlay_manager_t *_x_video_overlay_new_manager(void); #endif diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c index 10a8e5102..d915382d7 100644 --- a/src/xine-engine/vo_scale.c +++ b/src/xine-engine/vo_scale.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: vo_scale.c,v 1.25 2003/10/07 14:56:51 mroi Exp $ + * $Id: vo_scale.c,v 1.26 2003/11/11 18:45:01 f1rmb Exp $ * * Contains common code to calculate video scaling parameters. * In short, it will map frame dimensions to screen/window size. @@ -41,7 +41,7 @@ * taking into account aspect ratio and zoom factor */ -void vo_scale_compute_ideal_size (vo_scale_t *this) { +void _x_vo_scale_compute_ideal_size (vo_scale_t *this) { double image_ratio, desired_ratio; @@ -102,7 +102,7 @@ void vo_scale_compute_ideal_size (vo_scale_t *this) { * make ideal width/height "fit" into the gui */ -void vo_scale_compute_output_size (vo_scale_t *this) { +void _x_vo_scale_compute_output_size (vo_scale_t *this) { double x_factor, y_factor, aspect; @@ -224,7 +224,7 @@ void vo_scale_compute_output_size (vo_scale_t *this) { * aspect ratio changing, etc. */ -int vo_scale_redraw_needed (vo_scale_t *this) { +int _x_vo_scale_redraw_needed (vo_scale_t *this) { int gui_x, gui_y, gui_width, gui_height, gui_win_x, gui_win_y; double gui_pixel_aspect; int ret = 0; @@ -265,7 +265,7 @@ int vo_scale_redraw_needed (vo_scale_t *this) { * */ -void vo_scale_translate_gui2video(vo_scale_t *this, +void _x_vo_scale_translate_gui2video(vo_scale_t *this, int x, int y, int *vid_x, int *vid_y) { @@ -298,7 +298,7 @@ void vo_scale_translate_gui2video(vo_scale_t *this, * Returns description of a given ratio code */ -char *vo_scale_aspect_ratio_name(int a) { +char *_x_vo_scale_aspect_ratio_name(int a) { switch (a) { case XINE_VO_ASPECT_AUTO: @@ -339,7 +339,7 @@ static void vo_scale_vertical_pos_changed(void *data, xine_cfg_entry_t *entry) { * initialize rescaling struct */ -void vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled, +void _x_vo_scale_init(vo_scale_t *this, int support_zoom, int scaling_disabled, config_values_t *config ) { memset( this, 0, sizeof(vo_scale_t) ); diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h index f53f6b852..fdcc81b04 100644 --- a/src/xine-engine/vo_scale.h +++ b/src/xine-engine/vo_scale.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: vo_scale.h,v 1.9 2003/08/04 03:47:11 miguelfreitas Exp $ + * $Id: vo_scale.h,v 1.10 2003/11/11 18:45:01 f1rmb Exp $ * * vo_scale.h * @@ -153,45 +153,45 @@ typedef struct vo_scale_s vo_scale_t; * taking into account aspect ratio and zoom factor */ -void vo_scale_compute_ideal_size (vo_scale_t *self); +void _x_vo_scale_compute_ideal_size (vo_scale_t *self); /* * make ideal width/height "fit" into the gui */ -void vo_scale_compute_output_size (vo_scale_t *self); +void _x_vo_scale_compute_output_size (vo_scale_t *self); /* * return true if a redraw is needed due resizing, zooming, * aspect ratio changing, etc. */ -int vo_scale_redraw_needed (vo_scale_t *self); +int _x_vo_scale_redraw_needed (vo_scale_t *self); /* * */ -void vo_scale_translate_gui2video(vo_scale_t *self, - int x, int y, - int *vid_x, int *vid_y); +void _x_vo_scale_translate_gui2video(vo_scale_t *self, + int x, int y, + int *vid_x, int *vid_y); /* * Returns description of a given ratio code */ -char *vo_scale_aspect_ratio_name(int a); +char *_x_vo_scale_aspect_ratio_name(int a); /* * initialize rescaling struct */ -void vo_scale_init(vo_scale_t *self, int support_zoom, int scaling_disabled, config_values_t *config ); +void _x_vo_scale_init(vo_scale_t *self, int support_zoom, + int scaling_disabled, config_values_t *config ); #ifdef __cplusplus } #endif #endif - diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 0cf715593..a8cd857ad 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.261 2003/11/07 17:12:47 miguelfreitas Exp $ + * $Id: xine.c,v 1.262 2003/11/11 18:45:01 f1rmb Exp $ */ /* @@ -73,14 +73,14 @@ #endif /* WIN32 */ -void xine_handle_stream_end (xine_stream_t *stream, int non_user) { +void _x_handle_stream_end (xine_stream_t *stream, int non_user) { if (stream->status == XINE_STATUS_QUIT) return; stream->status = XINE_STATUS_STOP; /* join thread if needed to fix resource leaks */ - xine_demux_stop_thread( stream ); + _x_demux_stop_thread( stream ); if (non_user) { /* frontends will not be interested in receiving this event @@ -97,11 +97,11 @@ void xine_handle_stream_end (xine_stream_t *stream, int non_user) { } } -void extra_info_reset( extra_info_t *extra_info ) { +void _x_extra_info_reset( extra_info_t *extra_info ) { memset( extra_info, 0, sizeof(extra_info_t) ); } -void extra_info_merge( extra_info_t *dst, extra_info_t *src ) { +void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ) { if (!src->invalid) { if( src->input_pos ) @@ -124,7 +124,7 @@ void extra_info_merge( extra_info_t *dst, extra_info_t *src ) { } } -static void xine_set_speed_internal (xine_stream_t *stream, int speed) { +static void _x_set_speed_internal (xine_stream_t *stream, int speed) { stream->xine->clock->set_speed (stream->xine->clock, speed); @@ -159,7 +159,7 @@ static void xine_stop_internal (xine_stream_t *stream) { } /* make sure we're not in "paused" state */ - xine_set_speed_internal (stream, XINE_SPEED_NORMAL); + _x_set_speed_internal (stream, XINE_SPEED_NORMAL); /* Don't change status if we're quitting */ if (stream->status != XINE_STATUS_QUIT) @@ -181,16 +181,16 @@ static void xine_stop_internal (xine_stream_t *stream) { lprintf ("stopping demux\n"); if (stream->demux_plugin) { - xine_demux_stop_thread( stream ); + _x_demux_stop_thread( stream ); lprintf ("stop thread done\n"); /* set normal speed again (now that demuxer/input pair is suspended) * some input plugin may have changed speed by itself, we must ensure * the engine is not paused. */ - xine_set_speed_internal (stream, XINE_SPEED_NORMAL); + _x_set_speed_internal (stream, XINE_SPEED_NORMAL); - xine_demux_flush_engine( stream ); + _x_demux_flush_engine( stream ); lprintf ("flush engine done\n"); /* @@ -355,9 +355,9 @@ xine_stream_t *xine_stream_new (xine_t *this, stream->current_extra_info = malloc( sizeof( extra_info_t ) ); stream->audio_decoder_extra_info = malloc( sizeof( extra_info_t ) ); stream->video_decoder_extra_info = malloc( sizeof( extra_info_t ) ); - extra_info_reset( stream->current_extra_info ); - extra_info_reset( stream->video_decoder_extra_info ); - extra_info_reset( stream->audio_decoder_extra_info ); + _x_extra_info_reset( stream->current_extra_info ); + _x_extra_info_reset( stream->video_decoder_extra_info ); + _x_extra_info_reset( stream->audio_decoder_extra_info ); stream->xine = this; stream->status = XINE_STATUS_STOP; @@ -427,21 +427,21 @@ xine_stream_t *xine_stream_new (xine_t *this, * create a metronom */ - stream->metronom = metronom_init ( (ao != NULL), stream); + stream->metronom = _x_metronom_init ( (ao != NULL), stream); /* * alloc fifos, init and start decoder threads */ - video_decoder_init (stream); + _x_video_decoder_init (stream); - audio_decoder_init (stream); + _x_audio_decoder_init (stream); /* * osd */ - stream->osd_renderer = osd_renderer_init (stream->video_out->get_overlay_manager (stream->video_out), stream->xine->config ); + stream->osd_renderer = _x_osd_renderer_init (stream->video_out->get_overlay_manager (stream->video_out), stream->xine->config ); /* * register stream @@ -511,7 +511,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { * find an input plugin */ - if ((stream->input_plugin = find_input_plugin (stream, input_source))) { + if ((stream->input_plugin = _x_find_input_plugin (stream, input_source))) { xine_log (stream->xine, XINE_LOG_MSG, "xine: found input plugin : %s\n", stream->input_plugin->input_class->get_description(stream->input_plugin->input_class)); @@ -565,7 +565,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { demux_name[strlen(tmp)] = '\0'; } mrl_unescape(demux_name); - if (!(stream->demux_plugin = find_demux_plugin_by_name(stream, demux_name, stream->input_plugin))) { + if (!(stream->demux_plugin = _x_find_demux_plugin_by_name(stream, demux_name, stream->input_plugin))) { xine_log(stream->xine, XINE_LOG_MSG, _("xine: specified demuxer %s failed to start\n"), demux_name); stream->err = XINE_ERROR_NO_DEMUX_PLUGIN; @@ -605,7 +605,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { xine_log(stream->xine, XINE_LOG_MSG, _("xine: join rip input plugin\n")); - input_saver = rip_plugin_get_instance (stream, filename); + input_saver = _x_rip_plugin_get_instance (stream, filename); if( input_saver ) { stream->input_plugin = input_saver; } else { @@ -639,7 +639,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { demux_name[strlen(tmp)] = '\0'; } mrl_unescape(demux_name); - if (!(stream->demux_plugin = find_demux_plugin_last_probe(stream, demux_name, stream->input_plugin))) { + if (!(stream->demux_plugin = _x_find_demux_plugin_last_probe(stream, demux_name, stream->input_plugin))) { xine_log(stream->xine, XINE_LOG_MSG, _("xine: last_probed demuxer %s failed to start\n"), demux_name); stream->err = XINE_ERROR_NO_DEMUX_PLUGIN; @@ -799,7 +799,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { config_entry[strlen(tmp)] = '\0'; } mrl_unescape(config_entry); - retval = xine_config_change_opt(stream->xine->config, config_entry); + retval = _x_config_change_opt(stream->xine->config, config_entry); if (retval <= 0) { if (retval == 0) { /* the option not found */ @@ -827,7 +827,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { /* * find a demux plugin */ - if (!(stream->demux_plugin=find_demux_plugin (stream, stream->input_plugin))) { + if (!(stream->demux_plugin = _x_find_demux_plugin (stream, stream->input_plugin))) { xine_log (stream->xine, XINE_LOG_MSG, _("xine: couldn't find demux for >%s<\n"), mrl); stream->err = XINE_ERROR_NO_DEMUX_PLUGIN; @@ -835,7 +835,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { stream->status = XINE_STATUS_STOP; /* force the engine to unregister fifo callbacks */ - xine_demux_control_nop(stream, BUF_FLAG_END_STREAM); + _x_demux_control_nop(stream, BUF_FLAG_END_STREAM); return 0; } @@ -849,9 +849,9 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { "xine: found demuxer plugin: %s\n", stream->demux_plugin->demux_class->get_description(stream->demux_plugin->demux_class)); - extra_info_reset( stream->current_extra_info ); - extra_info_reset( stream->video_decoder_extra_info ); - extra_info_reset( stream->audio_decoder_extra_info ); + _x_extra_info_reset( stream->current_extra_info ); + _x_extra_info_reset( stream->video_decoder_extra_info ); + _x_extra_info_reset( stream->audio_decoder_extra_info ); /* assume handled for now. we will only know for sure after trying * to init decoders (which should happen when headers are sent) @@ -890,7 +890,7 @@ static int xine_open_internal (xine_stream_t *stream, const char *mrl) { return 0; } - xine_demux_control_headers_done (stream); + _x_demux_control_headers_done (stream); lprintf ("done\n"); return 1; @@ -933,7 +933,7 @@ static int xine_play_internal (xine_stream_t *stream, int start_pos, int start_t /* set normal speed */ if (stream->xine->clock->speed != XINE_SPEED_NORMAL) - xine_set_speed_internal (stream, XINE_SPEED_NORMAL); + _x_set_speed_internal (stream, XINE_SPEED_NORMAL); /* discard audio/video buffers to get engine going and take the lock faster */ if (stream->audio_out) @@ -949,7 +949,7 @@ static int xine_play_internal (xine_stream_t *stream, int start_pos, int start_t * the engine is not paused. */ if (stream->xine->clock->speed != XINE_SPEED_NORMAL) - xine_set_speed_internal (stream, XINE_SPEED_NORMAL); + _x_set_speed_internal (stream, XINE_SPEED_NORMAL); /* * start/seek demux @@ -983,7 +983,7 @@ static int xine_play_internal (xine_stream_t *stream, int start_pos, int start_t /* before resuming the demuxer, reset current position information */ pthread_mutex_lock( &stream->current_extra_info_lock ); - extra_info_reset( stream->current_extra_info ); + _x_extra_info_reset( stream->current_extra_info ); pthread_mutex_unlock( &stream->current_extra_info_lock ); /* now resume demuxer thread if it is running already */ @@ -998,7 +998,7 @@ static int xine_play_internal (xine_stream_t *stream, int start_pos, int start_t return 0; } else { - xine_demux_start_thread( stream ); + _x_demux_start_thread( stream ); stream->status = XINE_STATUS_PLAY; } @@ -1076,14 +1076,14 @@ void xine_dispose (xine_stream_t *stream) { } if(stream->broadcaster) - close_broadcaster(stream->broadcaster); + _x_close_broadcaster(stream->broadcaster); xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "shutdown audio\n"); - audio_decoder_shutdown (stream); - + _x_audio_decoder_shutdown (stream); + xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "shutdown video\n"); - video_decoder_shutdown (stream); - + _x_video_decoder_shutdown (stream); + stream->osd_renderer->close( stream->osd_renderer ); stream->video_fifo->dispose (stream->video_fifo); @@ -1118,7 +1118,7 @@ void xine_exit (xine_t *this) { for (i = 0; i < XINE_LOG_NUM; i++) this->log_buffers[i]->dispose (this->log_buffers[i]); - dispose_plugins (this); + _x_dispose_plugins (this); if(this->clock) this->clock->exit (this->clock); @@ -1163,14 +1163,14 @@ xine_t *xine_new (void) { * config */ - this->config = xine_config_init (); + this->config = _x_config_init (); /* * log buffers */ for (i = 0; i < XINE_LOG_NUM; i++) - this->log_buffers[i] = new_scratch_buffer (25); + this->log_buffers[i] = _x_new_scratch_buffer (25); #ifdef WIN32 @@ -1249,7 +1249,7 @@ static void config_save_cb (void *this_gen, xine_cfg_entry_t *entry) { pthread_mutex_lock(&this->streams_lock); if ((stream = (xine_stream_t *)xine_list_first_content(this->streams))) - xine_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), NULL); + _x_message(stream, XINE_MSG_SECURITY, _("The specified save_dir might be a security risk."), NULL); pthread_mutex_unlock(&this->streams_lock); } @@ -1271,7 +1271,7 @@ void xine_init (xine_t *this) { * plugins */ - scan_plugins(this); + _x_scan_plugins(this); #ifdef HAVE_SETLOCALE if (!setlocale(LC_CTYPE, "")) @@ -1308,13 +1308,13 @@ void xine_init (xine_t *this) { * start metronom clock */ - this->clock = metronom_clock_init(); + this->clock = _x_metronom_clock_init(); this->clock->start_clock (this->clock, 0); } -void xine_select_spu_channel (xine_stream_t *stream, int channel) { +void _x_select_spu_channel (xine_stream_t *stream, int channel) { pthread_mutex_lock (&stream->frontend_lock); stream->spu_channel_user = (channel >= -2 ? channel : -2); @@ -1352,9 +1352,9 @@ static int xine_get_current_position (xine_stream_t *stream) { if ( (!stream->video_decoder_plugin && !stream->audio_decoder_plugin) ) { if( stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] ) - extra_info_merge( stream->current_extra_info, stream->video_decoder_extra_info ); + _x_extra_info_merge( stream->current_extra_info, stream->video_decoder_extra_info ); else - extra_info_merge( stream->current_extra_info, stream->audio_decoder_extra_info ); + _x_extra_info_merge( stream->current_extra_info, stream->audio_decoder_extra_info ); } if ( stream->current_extra_info->seek_count != stream->video_seek_count ) { @@ -1376,7 +1376,7 @@ static int xine_get_current_position (xine_stream_t *stream) { return (int) share; } -void xine_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) { +void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) { pthread_mutex_lock( &stream->current_extra_info_lock ); memcpy( extra_info, stream->current_extra_info, size ); @@ -1392,7 +1392,7 @@ int xine_get_status (xine_stream_t *stream) { * trick play */ -void xine_set_speed (xine_stream_t *stream, int speed) { +void _x_set_speed (xine_stream_t *stream, int speed) { pthread_mutex_lock (&stream->frontend_lock); @@ -1402,7 +1402,7 @@ void xine_set_speed (xine_stream_t *stream, int speed) { speed = XINE_SPEED_FAST_4; xprintf (stream->xine, XINE_VERBOSITY_DEBUG, "set_speed %d\n", speed); - xine_set_speed_internal (stream, speed); + _x_set_speed_internal (stream, speed); pthread_mutex_unlock (&stream->frontend_lock); } @@ -1574,7 +1574,7 @@ int xine_get_audio_lang (xine_stream_t *stream, int channel, char *lang) { return 0; } -int xine_get_spu_channel (xine_stream_t *stream) { +int _x_get_spu_channel (xine_stream_t *stream) { return stream->spu_channel_user; } diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c index 741be2373..bec330a2b 100644 --- a/src/xine-engine/xine_interface.c +++ b/src/xine-engine/xine_interface.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_interface.c,v 1.63 2003/10/28 16:59:03 mroi Exp $ + * $Id: xine_interface.c,v 1.64 2003/11/11 18:45:02 f1rmb Exp $ * * convenience/abstraction layer, functions to implement * libxine's public interface @@ -322,7 +322,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) { switch (param) { case XINE_PARAM_SPEED: - xine_set_speed (stream, value); + _x_set_speed (stream, value); break; case XINE_PARAM_AV_OFFSET: @@ -342,7 +342,7 @@ void xine_set_param (xine_stream_t *stream, int param, int value) { break; case XINE_PARAM_SPU_CHANNEL: - xine_select_spu_channel (stream, value); + _x_select_spu_channel (stream, value); break; case XINE_PARAM_VIDEO_CHANNEL: @@ -428,9 +428,9 @@ void xine_set_param (xine_stream_t *stream, int param, int value) { case XINE_PARAM_BROADCASTER_PORT: if( !stream->broadcaster && value ) { - stream->broadcaster = init_broadcaster(stream, value); + stream->broadcaster = _x_init_broadcaster(stream, value); } else if ( stream->broadcaster && !value ) { - close_broadcaster(stream->broadcaster); + _x_close_broadcaster(stream->broadcaster); stream->broadcaster = NULL; } break; @@ -527,7 +527,7 @@ int xine_get_param (xine_stream_t *stream, int param) { case XINE_PARAM_BROADCASTER_PORT: if( stream->broadcaster ) - return get_broadcaster_port(stream->broadcaster); + return _x_get_broadcaster_port(stream->broadcaster); else return 0; break; @@ -761,7 +761,7 @@ xine_post_out_t * xine_get_audio_source(xine_stream_t *stream) { /* report error/message to UI. may be provided with several * string parameters. last parameter must be NULL. */ -int xine_message(xine_stream_t *stream, int type, ...) { +int _x_message(xine_stream_t *stream, int type, ...) { xine_ui_message_data_t *data; xine_event_t event; char *explanation; diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index 69e92f6ec..6379b51b0 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_internal.h,v 1.144 2003/10/21 16:08:04 mroi Exp $ + * $Id: xine_internal.h,v 1.145 2003/11/11 18:45:02 f1rmb Exp $ * */ @@ -284,34 +284,34 @@ struct xine_stream_s { * private function prototypes: */ -void xine_handle_stream_end (xine_stream_t *stream, int non_user); +void _x_handle_stream_end (xine_stream_t *stream, int non_user); /* report message to UI. usually these are async errors */ -int xine_message(xine_stream_t *stream, int type, ...); +int _x_message(xine_stream_t *stream, int type, ...); /* find and instantiate input and demux plugins */ -input_plugin_t *find_input_plugin (xine_stream_t *stream, const char *mrl); -demux_plugin_t *find_demux_plugin (xine_stream_t *stream, input_plugin_t *input); -demux_plugin_t *find_demux_plugin_by_name (xine_stream_t *stream, const char *name, input_plugin_t *input); -demux_plugin_t *find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input); -input_plugin_t *rip_plugin_get_instance (xine_stream_t *stream, const char *filename); +input_plugin_t *_x_find_input_plugin (xine_stream_t *stream, const char *mrl); +demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *input); +demux_plugin_t *_x_find_demux_plugin_by_name (xine_stream_t *stream, const char *name, input_plugin_t *input); +demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input); +input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename); /* create decoder fifos and threads */ -void video_decoder_init (xine_stream_t *stream); -void video_decoder_shutdown (xine_stream_t *stream); +void _x_video_decoder_init (xine_stream_t *stream); +void _x_video_decoder_shutdown (xine_stream_t *stream); -void audio_decoder_init (xine_stream_t *stream); -void audio_decoder_shutdown (xine_stream_t *stream); +void _x_audio_decoder_init (xine_stream_t *stream); +void _x_audio_decoder_shutdown (xine_stream_t *stream); /* extra_info operations */ -void extra_info_reset( extra_info_t *extra_info ); +void _x_extra_info_reset( extra_info_t *extra_info ); -void extra_info_merge( extra_info_t *dst, extra_info_t *src ); +void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ); -void xine_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size); +void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size); /* demuxer helper functions from demux.c */ @@ -325,19 +325,19 @@ void xine_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int * indication must be sent. relative discontinuities are likely * to cause "jumps" on metronom. */ -void xine_demux_flush_engine (xine_stream_t *stream); +void _x_demux_flush_engine (xine_stream_t *stream); -void xine_demux_control_nop (xine_stream_t *stream, uint32_t flags); -void xine_demux_control_newpts (xine_stream_t *stream, int64_t pts, uint32_t flags); -void xine_demux_control_headers_done (xine_stream_t *stream); -void xine_demux_control_start (xine_stream_t *stream); -void xine_demux_control_end (xine_stream_t *stream, uint32_t flags); -int xine_demux_start_thread (xine_stream_t *stream); -int xine_demux_stop_thread (xine_stream_t *stream); -int xine_demux_read_header (input_plugin_t *input, unsigned char *buffer, off_t size); -int xine_demux_check_extension (char *mrl, char *extensions); +void _x_demux_control_nop (xine_stream_t *stream, uint32_t flags); +void _x_demux_control_newpts (xine_stream_t *stream, int64_t pts, uint32_t flags); +void _x_demux_control_headers_done (xine_stream_t *stream); +void _x_demux_control_start (xine_stream_t *stream); +void _x_demux_control_end (xine_stream_t *stream, uint32_t flags); +int _x_demux_start_thread (xine_stream_t *stream); +int _x_demux_stop_thread (xine_stream_t *stream); +int _x_demux_read_header (input_plugin_t *input, unsigned char *buffer, off_t size); +int _x_demux_check_extension (char *mrl, char *extensions); -off_t xine_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo); +off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo); /* * plugin_loader functions @@ -346,12 +346,12 @@ off_t xine_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo); /* on-demand loading of audio/video/spu decoder plugins */ -video_decoder_t *get_video_decoder (xine_stream_t *stream, uint8_t stream_type); -void free_video_decoder (xine_stream_t *stream, video_decoder_t *decoder); -audio_decoder_t *get_audio_decoder (xine_stream_t *stream, uint8_t stream_type); -void free_audio_decoder (xine_stream_t *stream, audio_decoder_t *decoder); -spu_decoder_t *get_spu_decoder (xine_stream_t *stream, uint8_t stream_type); -void free_spu_decoder (xine_stream_t *stream, spu_decoder_t *decoder); +video_decoder_t *_x_get_video_decoder (xine_stream_t *stream, uint8_t stream_type); +void _x_free_video_decoder (xine_stream_t *stream, video_decoder_t *decoder); +audio_decoder_t *_x_get_audio_decoder (xine_stream_t *stream, uint8_t stream_type); +void _x_free_audio_decoder (xine_stream_t *stream, audio_decoder_t *decoder); +spu_decoder_t *_x_get_spu_decoder (xine_stream_t *stream, uint8_t stream_type); +void _x_free_spu_decoder (xine_stream_t *stream, spu_decoder_t *decoder); /* * load_video_output_plugin @@ -359,8 +359,8 @@ void free_spu_decoder (xine_stream_t *stream, spu_decoder_t *decod * load a specific video output plugin */ -vo_driver_t *xine_load_video_output_plugin(xine_t *this, - char *id, int visual_type, void *visual); +vo_driver_t *_x_load_video_output_plugin(xine_t *this, + char *id, int visual_type, void *visual); /* * audio output plugin dynamic loading stuff @@ -372,16 +372,16 @@ vo_driver_t *xine_load_video_output_plugin(xine_t *this, * load a specific audio output plugin */ -ao_driver_t *xine_load_audio_output_plugin (xine_t *self, char *id); +ao_driver_t *_x_load_audio_output_plugin (xine_t *self, char *id); -void xine_set_speed (xine_stream_t *stream, int speed) ; +void _x_set_speed (xine_stream_t *stream, int speed) ; -void xine_select_spu_channel (xine_stream_t *stream, int channel) ; +void _x_select_spu_channel (xine_stream_t *stream, int channel) ; -int xine_get_audio_channel (xine_stream_t *stream) ; +int _x_get_audio_channel (xine_stream_t *stream) ; -int xine_get_spu_channel (xine_stream_t *stream) ; +int _x_get_spu_channel (xine_stream_t *stream) ; /* * internal events |