diff options
Diffstat (limited to 'src')
131 files changed, 901 insertions, 897 deletions
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index b2624d354..cf92f9668 100644 --- a/src/demuxers/demux_4xm.c +++ b/src/demuxers/demux_4xm.c @@ -23,7 +23,7 @@ * For more information on the 4xm file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_4xm.c,v 1.6 2003/10/28 00:10:18 tmattern Exp $ + * $Id: demux_4xm.c,v 1.7 2003/11/11 18:44:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -119,7 +119,7 @@ static int open_fourxm_file(demux_fourxm_t *fourxm) { unsigned int current_track; /* the file signature will be in the first 12 bytes */ - if (xine_demux_read_header(fourxm->input, preview, 12) != 12) + if (_x_demux_read_header(fourxm->input, preview, 12) != 12) return 0; /* check for the signature tags */ @@ -370,7 +370,7 @@ static void demux_fourxm_send_headers(demux_plugin_t *this_gen) { } /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -402,7 +402,7 @@ static int demux_fourxm_seek (demux_plugin_t *this_gen, if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; } @@ -468,7 +468,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 2d4b76b39..b3d999c3a 100644 --- a/src/demuxers/demux_ac3.c +++ b/src/demuxers/demux_ac3.c @@ -23,7 +23,7 @@ * This demuxer detects raw AC3 data in a file and shovels AC3 data * directly to the AC3 decoder. * - * $Id: demux_ac3.c,v 1.11 2003/10/28 00:10:18 tmattern Exp $ + * $Id: demux_ac3.c,v 1.12 2003/11/11 18:44:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -122,7 +122,7 @@ static int open_ac3_file(demux_ac3_t *this) { unsigned char preamble[AC3_PREAMBLE_BYTES]; /* check if the sync mark matches up */ - if (xine_demux_read_header(this->input, preamble, AC3_PREAMBLE_BYTES) != + if (_x_demux_read_header(this->input, preamble, AC3_PREAMBLE_BYTES) != AC3_PREAMBLE_BYTES) return 0; @@ -187,7 +187,7 @@ static int demux_ac3_send_chunk (demux_plugin_t *this_gen) { audio_pts /= this->sample_rate; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, audio_pts, 0); + _x_demux_control_newpts(this->stream, audio_pts, 0); this->seek_flag = 0; } @@ -234,7 +234,7 @@ static void demux_ac3_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo) { @@ -253,7 +253,7 @@ static int demux_ac3_seek (demux_plugin_t *this_gen, this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -328,7 +328,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index d084dbbc2..c4d4ad1d9 100644 --- a/src/demuxers/demux_aiff.c +++ b/src/demuxers/demux_aiff.c @@ -21,7 +21,7 @@ /* * AIFF File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_aiff.c,v 1.33 2003/10/28 00:10:18 tmattern Exp $ + * $Id: demux_aiff.c,v 1.34 2003/11/11 18:44:51 f1rmb Exp $ * */ @@ -97,7 +97,7 @@ static int open_aiff_file(demux_aiff_t *this) { unsigned int chunk_size; unsigned char buffer[100]; - if (xine_demux_read_header(this->input, signature, AIFF_SIGNATURE_SIZE) != AIFF_SIGNATURE_SIZE) + if (_x_demux_read_header(this->input, signature, AIFF_SIGNATURE_SIZE) != AIFF_SIGNATURE_SIZE) return 0; /* check the signature */ @@ -188,7 +188,7 @@ static int demux_aiff_send_chunk (demux_plugin_t *this_gen) { current_pts /= this->audio_bytes_per_second; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, current_pts, 0); + _x_demux_control_newpts(this->stream, current_pts, 0); this->seek_flag = 0; } @@ -252,7 +252,7 @@ static void demux_aiff_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo && this->audio_type) { @@ -275,7 +275,7 @@ static int demux_aiff_seek (demux_plugin_t *this_gen, this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -363,7 +363,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 41b4d146d..843a4751e 100644 --- a/src/demuxers/demux_asf.c +++ b/src/demuxers/demux_asf.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: demux_asf.c,v 1.139 2003/11/09 14:32:04 tmattern Exp $ + * $Id: demux_asf.c,v 1.140 2003/11/11 18:44:51 f1rmb Exp $ * * demultiplexer for asf streams * @@ -439,8 +439,8 @@ static int asf_read_header (demux_asf_t *this) { xine_log(this->stream->xine, XINE_LOG_MSG, _("demux_asf: warning: The stream id=%d is encrypted\n."), stream_id); - xine_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, - _("Media stream scrambled/encrypted"), NULL); + _x_message(this->stream, XINE_MSG_ENCRYPTED_SOURCE, + _("Media stream scrambled/encrypted"), NULL); this->mode = ASF_MODE_ENCRYPTED_CONTENT; } @@ -450,7 +450,7 @@ static int asf_read_header (demux_asf_t *this) { uint8_t buffer[6]; this->input->read (this->input, (uint8_t *) this->wavex, total_size); - xine_waveformatex_le2me( (xine_waveformatex *) this->wavex ); + _x_waveformatex_le2me( (xine_waveformatex *) this->wavex ); /* printf ("total size: %d bytes\n", total_size); @@ -475,7 +475,7 @@ static int asf_read_header (demux_asf_t *this) { this->wavex_size = total_size; /* 18 + this->wavex[8]; */ this->streams[this->num_streams].buf_type = - formattag_to_buf_audio ( wavex->wFormatTag ); + _x_formattag_to_buf_audio ( wavex->wFormatTag ); if ( !this->streams[this->num_streams].buf_type ) { printf ("demux_asf: unknown audio type 0x%x\n", wavex->wFormatTag); this->streams[this->num_streams].buf_type = BUF_AUDIO_UNKNOWN; @@ -509,10 +509,10 @@ static int asf_read_header (demux_asf_t *this) { if( i > 0 && i < sizeof(this->bih) ) { this->bih_size = i; this->input->read (this->input, (uint8_t *) this->bih, this->bih_size); - xine_bmiheader_le2me( (xine_bmiheader *) this->bih ); + _x_bmiheader_le2me( (xine_bmiheader *) this->bih ); this->streams[this->num_streams].buf_type = - fourcc_to_buf_video(bih->biCompression); + _x_fourcc_to_buf_video(bih->biCompression); if( !this->streams[this->num_streams].buf_type ) { printf ("demux_asf: unknown video format %.4s\n", (char*)&bih->biCompression); @@ -648,7 +648,7 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start * send start buffer */ if (send_ctrl_start) { - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); } xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->title); @@ -749,10 +749,10 @@ static void check_newpts (demux_asf_t *this, int64_t pts, int video, int frame_e #endif if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; @@ -1866,7 +1866,7 @@ static void demux_asf_send_headers (demux_plugin_t *this_gen) { if ((this->mode == ASF_MODE_ASX_REF) || (this->mode == ASF_MODE_HTTP_REF) || (this->mode == ASF_MODE_ASF_REF)) { - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); return; } @@ -1926,7 +1926,7 @@ static int demux_asf_seek (demux_plugin_t *this_gen, if (this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) { this->buf_flag_seek = 1; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); if ( (!start_pos) && (start_time)) start_pos = start_time * this->rate; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 723722f52..f125f43fe 100644 --- a/src/demuxers/demux_aud.c +++ b/src/demuxers/demux_aud.c @@ -34,7 +34,7 @@ * data. This makes seeking conceptually impossible. Upshot: Random * seeking is not supported. * - * $Id: demux_aud.c,v 1.12 2003/10/31 23:58:32 tmattern Exp $ + * $Id: demux_aud.c,v 1.13 2003/11/11 18:44:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -85,7 +85,7 @@ typedef struct { static int open_aud_file(demux_aud_t *this) { unsigned char header[AUD_HEADER_SIZE]; - if (xine_demux_read_header(this->input, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE) + if (_x_demux_read_header(this->input, header, AUD_HEADER_SIZE) != AUD_HEADER_SIZE) return 0; /* Probabilistic content detection strategy: There is no file signature @@ -205,7 +205,7 @@ static void demux_aud_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to the audio decoder */ if (this->audio_fifo) { @@ -226,7 +226,7 @@ static int demux_aud_seek (demux_plugin_t *this_gen, demux_aud_t *this = (demux_aud_t *) this_gen; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -292,7 +292,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 6ca9d39b0..b6779f6e0 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.174 2003/11/11 18:10:42 tmattern Exp $ + * $Id: demux_avi.c,v 1.175 2003/11/11 18:44:51 f1rmb Exp $ * * demultiplexer for avi streams * @@ -273,10 +273,10 @@ static void check_newpts (demux_avi_t *this, int64_t pts, int video) { lprintf ("sending newpts %lld (video = %d diff = %lld)\n", pts, video, diff); if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; @@ -818,7 +818,7 @@ static avi_t *AVI_init(demux_avi_t *this) { return 0; } memcpy (AVI->bih, hdrl_data+i, n); - xine_bmiheader_le2me( AVI->bih ); + _x_bmiheader_le2me( AVI->bih ); /* stream_read(demuxer->stream,(char*) &avi_header.bih,MIN(size2,sizeof(avi_header.bih))); */ @@ -852,7 +852,7 @@ static avi_t *AVI_init(demux_avi_t *this) { AVI->audio[AVI->n_audio-1]->wavex_len=n; memcpy((void *)AVI->audio[AVI->n_audio-1]->wavex, hdrl_data+i, n); - xine_waveformatex_le2me( AVI->audio[AVI->n_audio-1]->wavex ); + _x_waveformatex_le2me( AVI->audio[AVI->n_audio-1]->wavex ); lprintf("audio stream format\n"); auds_strf_seen = 1; } @@ -1486,7 +1486,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { this->no_audio = 0; for(i=0; i < this->avi->n_audio; i++) { - this->avi->audio[i]->audio_type = formattag_to_buf_audio (this->avi->audio[i]->wavex->wFormatTag); + this->avi->audio[i]->audio_type = _x_formattag_to_buf_audio (this->avi->audio[i]->wavex->wFormatTag); if( !this->avi->audio[i]->audio_type ) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, @@ -1497,7 +1497,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { } else xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: audio type %s (wFormatTag 0x%x)\n", - buf_audio_name(this->avi->audio[i]->audio_type), + _x_buf_audio_name(this->avi->audio[i]->audio_type), (int)this->avi->audio[i]->wavex->wFormatTag); } @@ -1511,7 +1511,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { buf_element_t *buf; int i; - xine_demux_control_start (this->stream); + _x_demux_control_start (this->stream); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->decoder_flags = BUF_FLAG_HEADER; @@ -1519,12 +1519,12 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { memcpy (buf->content, this->avi->bih, this->avi->bih->biSize); buf->size = this->avi->bih->biSize; - this->avi->video_type = fourcc_to_buf_video(this->avi->bih->biCompression); + this->avi->video_type = _x_fourcc_to_buf_video(this->avi->bih->biCompression); if (this->avi->video_type) { this->avi->compressor = this->avi->bih->biCompression; } else - this->avi->video_type = fourcc_to_buf_video(this->avi->compressor); + this->avi->video_type = _x_fourcc_to_buf_video(this->avi->compressor); xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, this->avi->compressor); @@ -1539,7 +1539,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "demux_avi: video codec is '%s'\n", - buf_video_name(buf->type)); + _x_buf_video_name(buf->type)); this->video_fifo->put (this->video_fifo, buf); @@ -1604,7 +1604,7 @@ static int demux_avi_seek (demux_plugin_t *this_gen, demux_avi_t *this = (demux_avi_t *) this_gen; if (!this->streaming) { - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); this->seek_request = 1; this->seek_start_pos = start_pos; this->seek_start_time = start_time; @@ -1757,7 +1757,7 @@ static int demux_avi_seek_internal (demux_avi_t *this) { this->send_newpts = 1; this->buf_flag_seek = 1; - xine_demux_control_newpts (this->stream, video_pts, BUF_FLAG_SEEK); + _x_demux_control_newpts (this->stream, video_pts, BUF_FLAG_SEEK); return this->status; } @@ -1798,7 +1798,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str if (input->get_capabilities(input) & INPUT_CAP_BLOCK) return NULL; - if (xine_demux_read_header(input, buf, 12) != 12) + if (_x_demux_read_header(input, buf, 12) != 12) return NULL; if( strncasecmp(buf ,"RIFF",4) !=0 || @@ -1813,7 +1813,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) + if (!_x_demux_check_extension (mrl, extensions)) return NULL; } /* we want to fall through here */ diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index ce71b97ce..03f55da7f 100644 --- a/src/demuxers/demux_cdda.c +++ b/src/demuxers/demux_cdda.c @@ -24,7 +24,7 @@ * linear PCM "decoder" (which in turn sends them directly to the audio * output target; this is a really fancy CD-playing architecture). * - * $Id: demux_cdda.c,v 1.14 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_cdda.c,v 1.15 2003/11/11 18:44:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -93,7 +93,7 @@ static int demux_cdda_send_chunk (demux_plugin_t *this_gen) { buf->decoder_flags |= BUF_FLAG_FRAME_END; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, buf->pts, 0); + _x_demux_control_newpts(this->stream, buf->pts, 0); this->seek_flag = 0; } @@ -121,7 +121,7 @@ static void demux_cdda_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo) { @@ -147,7 +147,7 @@ static int demux_cdda_seek (demux_plugin_t *this_gen, off_t start_pos, int start this->input->seek(this->input, start_time * CD_BYTES_PER_SECOND, SEEK_SET); this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); return this->status; } diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index be0c89786..5de0ded35 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_eawve.c,v 1.21 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_eawve.c,v 1.22 2003/11/11 18:44:51 f1rmb Exp $ * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * @@ -294,7 +294,7 @@ static void demux_eawve_send_headers(demux_plugin_t *this_gen){ xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo) { @@ -314,7 +314,7 @@ static void demux_eawve_send_headers(demux_plugin_t *this_gen){ static int demux_eawve_seek(demux_eawve_t *this, off_t start_pos, int start_time){ if (!this->thread_running) { - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; this->sample_counter = 0; @@ -378,7 +378,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 1cf6bb42f..5075d5d09 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_elem.c,v 1.76 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_elem.c,v 1.77 2003/11/11 18:44:51 f1rmb Exp $ * * demultiplexer for elementary mpeg streams */ @@ -116,7 +116,7 @@ static void demux_mpeg_elem_send_headers (demux_plugin_t *this_gen) { this->blocksize = this->input->get_blocksize(this->input); - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); if (INPUT_IS_SEEKABLE(this->input)) { int num_buffers = NUM_PREVIEW_BUFFERS; @@ -144,7 +144,7 @@ static int demux_mpeg_elem_seek (demux_plugin_t *this_gen, this->status = DEMUX_OK; if (this->stream->demux_thread_running) - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); if (INPUT_IS_SEEKABLE(this->input)) { @@ -193,7 +193,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str case METHOD_BY_CONTENT: { uint8_t scratch[4]; - if (xine_demux_read_header(input, scratch, 4) != 4) + if (_x_demux_read_header(input, scratch, 4) != 4) return NULL; lprintf ("%02x %02x %02x %02x\n", scratch[0], scratch[1], scratch[2], scratch[3]); @@ -210,7 +210,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) + if (!_x_demux_check_extension (mrl, extensions)) return NULL; } break; diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index e207fefdb..56cf19efc 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.66 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_film.c,v 1.67 2003/11/11 18:44:51 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -139,7 +139,7 @@ static int open_film_file(demux_film_t *film) { film->audio_channels = 0; /* get the signature, header length and file version */ - if (xine_demux_read_header(film->input, scratch, 16) != 16) + if (_x_demux_read_header(film->input, scratch, 16) != 16) return 0; /* FILM signature correct? */ @@ -201,7 +201,7 @@ static int open_film_file(demux_film_t *film) { film->bih.biWidth = BE_32(&film_header[i + 16]); film->bih.biHeight = BE_32(&film_header[i + 12]); film->video_codec = *(uint32_t *)&film_header[i + 8]; - film->video_type = fourcc_to_buf_video(*(uint32_t *)&film_header[i + 8]); + film->video_type = _x_fourcc_to_buf_video(*(uint32_t *)&film_header[i + 8]); if( !film->video_type ) film->video_type = BUF_VIDEO_UNKNOWN; @@ -375,7 +375,7 @@ static int demux_film_send_chunk(demux_plugin_t *this_gen) { * must be time to send a new pts */ if (this->last_sample + 1 != this->current_sample) { /* send new pts */ - xine_demux_control_newpts(this->stream, this->sample_table[i].pts, + _x_demux_control_newpts(this->stream, this->sample_table[i].pts, (this->sample_table[i].pts) ? BUF_FLAG_SEEK : 0); } @@ -680,7 +680,7 @@ static void demux_film_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->video_type) { @@ -716,7 +716,7 @@ static int demux_film_seek (demux_plugin_t *this_gen, off_t start_pos, int start this->waiting_for_keyframe = 1; this->status = DEMUX_OK; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); if( !this->stream->demux_thread_running ) { this->waiting_for_keyframe = 0; @@ -867,7 +867,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index 1fa1f45f9..c828eedf1 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -24,7 +24,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.45 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_fli.c,v 1.46 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -83,7 +83,7 @@ typedef struct { /* returns 1 if the FLI file was opened successfully, 0 otherwise */ static int open_fli_file(demux_fli_t *this) { - if (xine_demux_read_header(this->input, this->fli_header, FLI_HEADER_SIZE) != FLI_HEADER_SIZE) + if (_x_demux_read_header(this->input, this->fli_header, FLI_HEADER_SIZE) != FLI_HEADER_SIZE) return 0; /* validate the file */ @@ -235,7 +235,7 @@ static void demux_fli_send_headers(demux_plugin_t *this_gen) { this->frame_pts_inc); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to FLI decoder */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -256,7 +256,7 @@ static int demux_fli_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; this->stream_len = this->input->get_length(this->input); @@ -321,7 +321,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index c539d4a4a..3a7f57245 100644 --- a/src/demuxers/demux_idcin.c +++ b/src/demuxers/demux_idcin.c @@ -65,7 +65,7 @@ * - if any bytes exceed 63, do not shift the bytes at all before * transmitting them to the video decoder * - * $Id: demux_idcin.c,v 1.45 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_idcin.c,v 1.46 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -277,7 +277,7 @@ static int open_idcin_file(demux_idcin_t *this) { xine_bmiheader *bih = (xine_bmiheader *)this->bih; unsigned char *huffman_table = this->bih + sizeof(xine_bmiheader); - if (xine_demux_read_header(this->input, header, IDCIN_HEADER_SIZE) != IDCIN_HEADER_SIZE) + if (_x_demux_read_header(this->input, header, IDCIN_HEADER_SIZE) != IDCIN_HEADER_SIZE) return 0; /* @@ -365,7 +365,7 @@ static void demux_idcin_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ bih->biSize = sizeof(xine_bmiheader) + HUFFMAN_TABLE_SIZE; @@ -414,7 +414,7 @@ static int demux_idcin_seek (demux_plugin_t *this_gen, off_t start_pos, int star if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; @@ -484,7 +484,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index db051f4ea..0ebbe6c03 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_image.c,v 1.8 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_image.c,v 1.9 2003/11/11 18:44:52 f1rmb Exp $ * * image dummy demultiplexer */ @@ -144,7 +144,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { return NULL; } } diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index 80c26f93f..49405c0de 100644 --- a/src/demuxers/demux_ipmovie.c +++ b/src/demuxers/demux_ipmovie.c @@ -23,7 +23,7 @@ * For more information regarding the Interplay MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_ipmovie.c,v 1.16 2003/10/30 05:57:26 tmmm Exp $ + * $Id: demux_ipmovie.c,v 1.17 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -523,7 +523,7 @@ static int open_ipmovie_file(demux_ipmovie_t *this) { this->audio_type = 0; - if (xine_demux_read_header(this->input, signature, IPMOVIE_SIGNATURE_SIZE) != + if (_x_demux_read_header(this->input, signature, IPMOVIE_SIGNATURE_SIZE) != IPMOVIE_SIGNATURE_SIZE) return 0; @@ -574,7 +574,7 @@ static void demux_ipmovie_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to video decoder */ this->bih.biSize = sizeof(xine_bmiheader); @@ -628,7 +628,7 @@ static int demux_ipmovie_seek (demux_plugin_t *this_gen, if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; } @@ -693,7 +693,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index 66364d2a0..e69709cd8 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.12 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_mng.c,v 1.13 2003/11/11 18:44:52 f1rmb Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -206,7 +206,7 @@ static void demux_mng_send_headers(demux_mng_t *this){ xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoder */ this->bih.biBitCount = 24; @@ -285,7 +285,7 @@ static demux_plugin_t* open_plugin(demux_class_t *class_gen, xine_stream_t *stre mrl = input->get_mrl(input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index 08cbf9795..0cf5fb16b 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.125 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_mpeg.c,v 1.126 2003/11/11 18:44:52 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -227,10 +227,10 @@ static void check_newpts( demux_mpeg_t *this, int64_t pts, int video ) { (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) { if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; this->last_pts[1-video] = 0; @@ -888,7 +888,7 @@ static void demux_mpeg_send_headers (demux_plugin_t *this_gen) { this->last_pts[0] = 0; this->last_pts[1] = 0; - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* * send preview buffers for stream/meta_info @@ -949,7 +949,7 @@ static int demux_mpeg_seek (demux_plugin_t *this_gen, this->buf_flag_seek = 0; } else { this->buf_flag_seek = 1; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; @@ -1020,7 +1020,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str } /* look for mpeg header */ - if (xine_demux_read_header(input, buf, 4) == 4) { + if (_x_demux_read_header(input, buf, 4) == 4) { lprintf ("%02x %02x %02x %02x\n", buf[0], buf[1], buf[2], buf[3]); if (!buf[0] && !buf[1] && (buf[2] == 0x01) && (buf[3] == 0xba)) /* if so, take it */ @@ -1112,7 +1112,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 63ed3b929..0834d50f9 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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: demux_mpeg_block.c,v 1.196 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_mpeg_block.c,v 1.197 2003/11/11 18:44:52 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -164,10 +164,10 @@ static void check_newpts( demux_mpeg_block_t *this, int64_t pts, int video ) printf("demux_mpeg_block: discontinuity detected by pts wrap\n"); #endif if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; } else { @@ -540,10 +540,10 @@ static int32_t parse_private_stream_2(demux_mpeg_block_t *this, uint8_t *p, buf_ printf("demux_mpeg_block: discontinuity detected by nav packet\n" ); #endif if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, start_pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, start_pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, start_pts, 0); + _x_demux_control_newpts(this->stream, start_pts, 0); } } this->nav_last_end_pts = end_pts; @@ -656,7 +656,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_block_t *this, uint8_t *p, buf_eleme printf("demux_mpeg_block: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n", (p[6] & 0x30) >> 4); xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_mpeg_block: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4); - xine_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, + _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Media stream scrambled/encrypted", NULL); this->status = DEMUX_FINISHED; buf->free_buffer(buf); @@ -1161,7 +1161,7 @@ static void demux_mpeg_block_send_headers (demux_plugin_t *this_gen) { * send start buffer */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); #ifdef USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY if (!this->rate) @@ -1242,7 +1242,7 @@ static int demux_mpeg_block_seek (demux_plugin_t *this_gen, } else { this->buf_flag_seek = 1; this->nav_last_end_pts = this->nav_last_start_pts = 0; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index a2b168b35..d9bcc79c2 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.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: demux_mpeg_pes.c,v 1.13 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_mpeg_pes.c,v 1.14 2003/11/11 18:44:52 f1rmb Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -147,10 +147,10 @@ static void check_newpts( demux_mpeg_pes_t *this, int64_t pts, int video ) printf("demux_mpeg_pes: discontinuity detected by pts wrap\n"); #endif if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; } else { @@ -554,10 +554,10 @@ static int32_t parse_private_stream_2(demux_mpeg_pes_t *this, uint8_t *p, buf_el printf("demux_mpeg_pes: discontinuity detected by nav packet\n" ); #endif if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, start_pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, start_pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, start_pts, 0); + _x_demux_control_newpts(this->stream, start_pts, 0); } } this->nav_last_end_pts = end_pts; @@ -677,7 +677,7 @@ static int32_t parse_pes_for_pts(demux_mpeg_pes_t *this, uint8_t *p, buf_element printf("demux_mpeg_pes: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n", (p[6] & 0x30) >> 4); xine_log (this->stream->xine, XINE_LOG_MSG, _("demux_mpeg_pes: warning: PES header indicates that this stream may be encrypted (encryption mode %d)\n"), (p[6] & 0x30) >> 4); - xine_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, + _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, "Media stream scrambled/encrypted", NULL); this->status = DEMUX_FINISHED; buf->free_buffer(buf); @@ -1209,7 +1209,7 @@ static void demux_mpeg_pes_send_headers (demux_plugin_t *this_gen) { * send start buffer */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); #ifdef USE_ILL_ADVISED_ESTIMATE_RATE_INITIALLY if (!this->rate) @@ -1290,7 +1290,7 @@ static int demux_mpeg_pes_seek (demux_plugin_t *this_gen, } else { this->buf_flag_seek = 1; this->nav_last_end_pts = this->nav_last_start_pts = 0; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 4ccc814d1..25ccfb2fb 100644 --- a/src/demuxers/demux_mpgaudio.c +++ b/src/demuxers/demux_mpgaudio.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: demux_mpgaudio.c,v 1.121 2003/11/01 01:44:54 tmattern Exp $ + * $Id: demux_mpgaudio.c,v 1.122 2003/11/11 18:44:52 f1rmb Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -217,10 +217,10 @@ static void check_newpts (demux_mpgaudio_t *this, int64_t pts) { if( pts && (this->send_newpts || (this->last_pts && abs(diff)>WRAP_THRESHOLD) ) ) { if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; } @@ -826,7 +826,7 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) { /* * send preview buffers */ - xine_demux_control_start (this->stream); + _x_demux_control_start (this->stream); if ((this->input->get_capabilities(this->input) & INPUT_CAP_SEEKABLE) != 0) this->input->seek (this->input, 0, SEEK_SET); @@ -956,7 +956,7 @@ static int demux_mpgaudio_seek (demux_plugin_t *this_gen, this->buf_flag_seek = 0; } else { this->buf_flag_seek = 1; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; @@ -1096,7 +1096,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str if (strncmp (mrl, "ice :/", 6)) { char *extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) + if (!_x_demux_check_extension (mrl, extensions)) return NULL; } diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c index 255909a14..ad80a694e 100644 --- a/src/demuxers/demux_nsf.c +++ b/src/demuxers/demux_nsf.c @@ -30,7 +30,7 @@ * For more information regarding the NSF format, visit: * http://www.tripoint.org/kevtris/nes/nsfspec.txt * - * $Id: demux_nsf.c,v 1.16 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_nsf.c,v 1.17 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -165,7 +165,7 @@ static int demux_nsf_send_chunk(demux_plugin_t *this_gen) { xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, title); - xine_demux_control_newpts(this->stream, this->current_pts, 0); + _x_demux_control_newpts(this->stream, this->current_pts, 0); } else buf->decoder_info[1] = 0; @@ -210,7 +210,7 @@ static void demux_nsf_send_headers(demux_plugin_t *this_gen) { xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, copyright); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to the audio decoder */ if (this->audio_fifo) { @@ -243,7 +243,7 @@ static int demux_nsf_seek (demux_plugin_t *this_gen, if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; @@ -257,7 +257,7 @@ static int demux_nsf_seek (demux_plugin_t *this_gen, this->current_song = start_pos + 1; this->new_song = 1; this->current_pts = 0; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; @@ -329,7 +329,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index 3b9cb54dc..8b7c936ee 100644 --- a/src/demuxers/demux_nsv.c +++ b/src/demuxers/demux_nsv.c @@ -23,7 +23,7 @@ * For more information regarding the NSV file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_nsv.c,v 1.6 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_nsv.c,v 1.7 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -91,7 +91,7 @@ static int open_nsv_file(demux_nsv_t *this) { unsigned int video_fourcc; unsigned int audio_fourcc; - if (xine_demux_read_header(this->input, preview, 4) != 4) + if (_x_demux_read_header(this->input, preview, 4) != 4) return 0; /* check for a 'NSV' signature */ @@ -138,13 +138,13 @@ static int open_nsv_file(demux_nsv_t *this) { if (BE_32(&preview[4]) == NONE_TAG) this->video_type = 0; else - this->video_type = fourcc_to_buf_video(video_fourcc); + this->video_type = _x_fourcc_to_buf_video(video_fourcc); audio_fourcc = ME_32(&preview[8]); if (BE_32(&preview[8]) == NONE_TAG) this->audio_type = 0; else - this->audio_type = formattag_to_buf_audio(audio_fourcc); + this->audio_type = _x_formattag_to_buf_audio(audio_fourcc); this->bih.biSize = sizeof(this->bih); this->bih.biWidth = LE_16(&preview[12]); @@ -347,7 +347,7 @@ static void demux_nsv_send_headers(demux_plugin_t *this_gen) { this->bih.biHeight); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to the video decoder */ if (this->video_fifo && this->video_type) { @@ -372,7 +372,7 @@ static int demux_nsv_seek (demux_plugin_t *this_gen, if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; } @@ -435,7 +435,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index ba1a35828..665b670d6 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.112 2003/10/31 23:58:32 tmattern Exp $ + * $Id: demux_ogg.c,v 1.113 2003/11/11 18:44:52 f1rmb Exp $ * * demultiplexer for ogg streams * @@ -332,10 +332,10 @@ static void check_newpts (demux_ogg_t *this, int64_t pts, int video, int preview "diff=%lld (pts=%lld, last_pts=%lld)\n", diff, pts, this->last_pts[video]); if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; this->last_pts[1-video] = 0; @@ -850,7 +850,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) { channel = this->num_video_streams++; - this->buf_types[stream_num] = fourcc_to_buf_video (locsubtype); + this->buf_types[stream_num] = _x_fourcc_to_buf_video (locsubtype); if( !this->buf_types[stream_num] ) this->buf_types[stream_num] = BUF_VIDEO_UNKNOWN; this->buf_types[stream_num] |= channel; @@ -1022,7 +1022,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) { fcc = *(uint32_t*)(op.packet+68); lprintf ("fourcc %08x\n", fcc); - this->buf_types[stream_num] = fourcc_to_buf_video (fcc); + this->buf_types[stream_num] = _x_fourcc_to_buf_video (fcc); if( !this->buf_types[stream_num] ) this->buf_types[stream_num] = BUF_VIDEO_UNKNOWN; this->buf_types[stream_num] |= channel; @@ -1426,7 +1426,7 @@ static void demux_ogg_send_headers (demux_plugin_t *this_gen) { this->input->seek (this->input, 0, SEEK_SET); if (this->status == DEMUX_OK) { - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send header */ demux_ogg_send_header (this); @@ -1553,7 +1553,7 @@ static int demux_ogg_seek (demux_plugin_t *this_gen, this->start_pts=-1; } - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } return this->status; @@ -1643,7 +1643,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, case METHOD_BY_CONTENT: { uint8_t buf[4]; - if (xine_demux_read_header(input, buf, 4) != 4) + if (_x_demux_read_header(input, buf, 4) != 4) return NULL; if ((buf[0] != 'O') @@ -1660,7 +1660,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { return NULL; } } diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 7205f1899..61d2333d6 100644 --- a/src/demuxers/demux_pva.c +++ b/src/demuxers/demux_pva.c @@ -23,7 +23,7 @@ * For more information regarding the PVA file format, refer to this PDF: * http://www.technotrend.de/download/av_format_v1.pdf * - * $Id: demux_pva.c,v 1.12 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_pva.c,v 1.13 2003/11/11 18:44:52 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -86,7 +86,7 @@ static void check_newpts( demux_pva_t *this, int64_t pts, int video ){ if( pts && (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); this->send_newpts = 0; this->last_pts[1-video] = 0; @@ -283,7 +283,7 @@ static void demux_pva_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to video decoder (cribbed from demux_elem.c) */ buf = this->video_fifo->buffer_pool_alloc(this->video_fifo); @@ -384,7 +384,7 @@ static int demux_pva_seek (demux_plugin_t *this_gen, this->status = DEMUX_OK; } else - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); return this->status; } @@ -450,7 +450,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 06c3a63c8..4e40da96d 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.169 2003/11/09 04:46:30 tmmm Exp $ + * $Id: demux_qt.c,v 1.170 2003/11/11 18:44:52 f1rmb Exp $ * */ @@ -1055,7 +1055,7 @@ static qt_error parse_trak_atom (qt_trak *trak, memcpy(&trak->stsd_atoms[k].audio.wave, &trak_atom[atom_pos + 0x4C], sizeof(trak->stsd_atoms[k].audio.wave)); - xine_waveformatex_le2me(&trak->stsd_atoms[k].audio.wave); + _x_waveformatex_le2me(&trak->stsd_atoms[k].audio.wave); } else { trak->stsd_atoms[k].audio.wave_present = 0; } @@ -2059,11 +2059,11 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) { /* if audio is present, send pts of current audio frame, otherwise * send current video frame pts */ if (audio_trak) - xine_demux_control_newpts(this->stream, + _x_demux_control_newpts(this->stream, audio_trak->frames[audio_trak->current_frame].pts, BUF_FLAG_SEEK); else - xine_demux_control_newpts(this->stream, + _x_demux_control_newpts(this->stream, video_trak->frames[video_trak->current_frame].pts, BUF_FLAG_SEEK); } @@ -2344,7 +2344,7 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { this->bih.biCompression = video_trak->properties->video.codec_fourcc; video_trak->properties->video.codec_buftype = - fourcc_to_buf_video(this->bih.biCompression); + _x_fourcc_to_buf_video(this->bih.biCompression); /* hack: workaround a fourcc clash! 'mpg4' is used by MS and Sorenson * mpeg4 codecs (they are not compatible). @@ -2378,7 +2378,7 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { if (this->qt->audio_trak != -1) { audio_trak->properties->audio.codec_buftype = - formattag_to_buf_audio(audio_trak->properties->audio.codec_fourcc); + _x_formattag_to_buf_audio(audio_trak->properties->audio.codec_fourcc); if( !audio_trak->properties->audio.codec_buftype && audio_trak->properties->audio.codec_fourcc ) @@ -2415,7 +2415,7 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, this->qt->comment); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (video_trak && @@ -2627,7 +2627,7 @@ static int demux_qt_seek (demux_plugin_t *this_gen, * otherwise decoder_config is flushed too. */ if(this->stream->demux_thread_running) - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); return this->status; } @@ -2719,7 +2719,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* special consideration for DRM-protected files */ if (this->qt->last_error == QT_DRM_NOT_SUPPORTED) - xine_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, + _x_message (this->stream, XINE_MSG_ENCRYPTED_SOURCE, "DRM-protected Quicktime file", NULL); } else if (last_error != QT_OK) { diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index f876fc60d..052d148ae 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_rawdv.c,v 1.12 2003/10/30 00:49:07 tmattern Exp $ + * $Id: demux_rawdv.c,v 1.13 2003/11/11 18:44:53 f1rmb Exp $ * * demultiplexer for raw dv streams */ @@ -147,7 +147,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) { this->video_fifo = this->stream->video_fifo; this->audio_fifo = this->stream->audio_fifo; - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); scratch = (unsigned char *) malloc(NTSC_FRAME_SIZE); if (scratch == NULL ) @@ -304,9 +304,9 @@ static int demux_raw_dv_seek (demux_plugin_t *this_gen, this->pts = this->cur_frame * this->duration; this->bytes_left = this->frame_size; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); - xine_demux_control_newpts (this->stream, this->pts, BUF_FLAG_SEEK); + _x_demux_control_newpts (this->stream, this->pts, BUF_FLAG_SEEK); return this->status; } @@ -361,7 +361,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index fc0f2f33c..c12c5f85f 100644 --- a/src/demuxers/demux_real.c +++ b/src/demuxers/demux_real.c @@ -30,7 +30,7 @@ * * Based on FFmpeg's libav/rm.c. * - * $Id: demux_real.c,v 1.68 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_real.c,v 1.69 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -435,7 +435,7 @@ static void real_parse_headers (demux_real_t *this) { lprintf("fourcc = %.4s\n", (char *) &fourcc); this->audio_streams[this->num_audio_streams].fourcc = fourcc; - this->audio_streams[this->num_audio_streams].buf_type = formattag_to_buf_audio(fourcc); + this->audio_streams[this->num_audio_streams].buf_type = _x_formattag_to_buf_audio(fourcc); this->audio_streams[this->num_audio_streams].index = NULL; this->audio_streams[this->num_audio_streams].mdpr = mdpr; @@ -454,7 +454,7 @@ static void real_parse_headers (demux_real_t *this) { lprintf("fourcc = %.4s\n", (char *) &fourcc); this->video_streams[this->num_video_streams].fourcc = fourcc; - this->video_streams[this->num_video_streams].buf_type = fourcc_to_buf_video(fourcc); + this->video_streams[this->num_video_streams].buf_type = _x_fourcc_to_buf_video(fourcc); this->video_streams[this->num_video_streams].index = NULL; this->video_streams[this->num_video_streams].mdpr = mdpr; @@ -794,10 +794,10 @@ static void check_newpts (demux_real_t *this, int64_t pts, int video, int previe lprintf ("diff=%lld\n", diff); if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; this->last_pts[1-video] = 0; @@ -1144,7 +1144,7 @@ static void demux_real_send_headers(demux_plugin_t *this_gen) { /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ @@ -1205,7 +1205,7 @@ static int demux_real_seek (demux_plugin_t *this_gen, if(this->stream->demux_thread_running) { this->buf_flag_seek = 1; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } } @@ -1289,7 +1289,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str case METHOD_BY_CONTENT:{ - if (! (len = xine_demux_read_header(input, buf, 1024)) ) + if (! (len = _x_demux_read_header(input, buf, 1024)) ) return NULL; lprintf ("read 4 bytes: %02x %02x %02x %02x\n", @@ -1310,7 +1310,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str lprintf ("by extension '%s'\n", mrl); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { return NULL; } lprintf ("by extension accepted.\n"); @@ -1333,7 +1333,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str /* discover stream type */ if(!stream_type) - if ( (len = xine_demux_read_header(this->input, buf, 1024)) ) + if ( (len = _x_demux_read_header(this->input, buf, 1024)) ) stream_type = real_check_stream_type(buf,len); if(stream_type == 2){ diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index a6d03ed8a..b790cfa5c 100644 --- a/src/demuxers/demux_realaudio.c +++ b/src/demuxers/demux_realaudio.c @@ -22,7 +22,7 @@ * RealAudio File Demuxer by Mike Melanson (melanson@pcisys.net) * improved by James Stembridge (jstembridge@users.sourceforge.net) * - * $Id: demux_realaudio.c,v 1.24 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_realaudio.c,v 1.25 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -85,7 +85,7 @@ static int open_ra_file(demux_ra_t *this) { /* check the signature */ - if (xine_demux_read_header(this->input, file_header, RA_FILE_HEADER_PREV_SIZE) != + if (_x_demux_read_header(this->input, file_header, RA_FILE_HEADER_PREV_SIZE) != RA_FILE_HEADER_PREV_SIZE) return 0; @@ -110,7 +110,7 @@ static int open_ra_file(demux_ra_t *this) { /* allocate for and read header data */ audio_header = xine_xmalloc(hdr_size); - if (xine_demux_read_header(this->input, audio_header, hdr_size) != hdr_size) { + if (_x_demux_read_header(this->input, audio_header, hdr_size) != hdr_size) { printf("demux_realaudio: unable to read header\n"); free(audio_header); return 0; @@ -195,7 +195,7 @@ static int open_ra_file(demux_ra_t *this) { } xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, audio_fourcc); - this->audio_type = formattag_to_buf_audio(audio_fourcc); + this->audio_type = _x_formattag_to_buf_audio(audio_fourcc); /* seek to start of data */ this->data_start = hdr_size; @@ -228,7 +228,7 @@ static int demux_ra_send_chunk(demux_plugin_t *this_gen) { current_pts = 0; /* let the engine sort out the pts for now */ if (this->seek_flag) { - xine_demux_control_newpts(this->stream, current_pts, 0); + _x_demux_control_newpts(this->stream, current_pts, 0); this->seek_flag = 0; } @@ -285,7 +285,7 @@ static void demux_ra_send_headers(demux_plugin_t *this_gen) { this->wave.wBitsPerSample); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo && this->audio_type) { @@ -309,7 +309,7 @@ static int demux_ra_seek (demux_plugin_t *this_gen, this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -401,7 +401,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index 955d085da..0a36756d4 100644 --- a/src/demuxers/demux_roq.c +++ b/src/demuxers/demux_roq.c @@ -23,7 +23,7 @@ * For more information regarding the RoQ file format, visit: * http://www.csse.monash.edu.au/~timf/ * - * $Id: demux_roq.c,v 1.44 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_roq.c,v 1.45 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -320,7 +320,7 @@ static void demux_roq_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -360,7 +360,7 @@ static int demux_roq_seek (demux_plugin_t *this_gen, if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; @@ -434,7 +434,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 0a1638ac4..270da8838 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.6 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_slave.c,v 1.7 2003/11/11 18:44:53 f1rmb Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -138,7 +138,7 @@ static int demux_slave_next (demux_slave_t *this) { * of the initial pts. */ if( pts && this->send_newpts ) { - xine_demux_control_newpts( this->stream, pts, 0 ); + _x_demux_control_newpts( this->stream, pts, 0 ); this->send_newpts = 0; } @@ -153,7 +153,7 @@ static int demux_slave_next (demux_slave_t *this) { this->stream->metronom->get_option(this->stream->metronom, METRONOM_VPTS_OFFSET) < curvpts ) { xprintf(this->stream->xine, XINE_VERBOSITY_LOG, "we are running late, forcing newpts.\n"); - xine_demux_control_newpts( this->stream, pts - NETWORK_PREBUFFER, 0 ); + _x_demux_control_newpts( this->stream, pts - NETWORK_PREBUFFER, 0 ); } this->last_vpts = curvpts; } @@ -241,7 +241,7 @@ static int demux_slave_next (demux_slave_t *this) { } else if( !strcmp(this->scratch,"flush_engine") ) { - xine_demux_flush_engine( this->stream ); + _x_demux_flush_engine( this->stream ); n = this->scratch_used - (p-this->scratch); if( n ) memmove(this->scratch, p, n); @@ -279,7 +279,7 @@ static void demux_slave_send_headers (demux_plugin_t *this_gen) { this->video_fifo = this->stream->video_fifo; this->audio_fifo = this->stream->audio_fifo; - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); this->status = DEMUX_OK; @@ -353,7 +353,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str case METHOD_BY_CONTENT: { - if (xine_demux_read_header(input, this->scratch, SCRATCH_SIZE) > 0) { + if (_x_demux_read_header(input, this->scratch, SCRATCH_SIZE) > 0) { if (!strncmp(this->scratch,slave_id_str,strlen(slave_id_str))) break; } diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index 563ba6116..d49382098 100644 --- a/src/demuxers/demux_smjpeg.c +++ b/src/demuxers/demux_smjpeg.c @@ -23,7 +23,7 @@ * For more information on the SMJPEG file format, visit: * http://www.lokigames.com/development/smjpeg.php3 * - * $Id: demux_smjpeg.c,v 1.42 2003/10/31 23:58:32 tmattern Exp $ + * $Id: demux_smjpeg.c,v 1.43 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -103,7 +103,7 @@ static int open_smjpeg_file(demux_smjpeg_t *this) { unsigned char header_chunk[SMJPEG_HEADER_CHUNK_MAX_SIZE]; unsigned int audio_codec = 0; - if (xine_demux_read_header(this->input, signature, SMJPEG_SIGNATURE_SIZE) != + if (_x_demux_read_header(this->input, signature, SMJPEG_SIGNATURE_SIZE) != SMJPEG_SIGNATURE_SIZE) return 0; @@ -151,7 +151,7 @@ static int open_smjpeg_file(demux_smjpeg_t *this) { this->bih.biWidth = BE_16(&header_chunk[8]); this->bih.biHeight = BE_16(&header_chunk[10]); this->bih.biCompression = *(uint32_t *)&header_chunk[12]; - this->video_type = fourcc_to_buf_video(this->bih.biCompression); + this->video_type = _x_fourcc_to_buf_video(this->bih.biCompression); break; case _SND_TAG: @@ -170,7 +170,7 @@ static int open_smjpeg_file(demux_smjpeg_t *this) { this->audio_type = BUF_AUDIO_SMJPEG_IMA; } else { audio_codec = *(uint32_t *)&header_chunk[8]; - this->audio_type = formattag_to_buf_audio(audio_codec); + this->audio_type = _x_formattag_to_buf_audio(audio_codec); } break; @@ -330,7 +330,7 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -432,7 +432,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index cfaa8ba1d..053579192 100644 --- a/src/demuxers/demux_snd.c +++ b/src/demuxers/demux_snd.c @@ -21,7 +21,7 @@ /* * SND/AU File Demuxer by Mike Melanson (melanson@pcisys.net) * - * $Id: demux_snd.c,v 1.33 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_snd.c,v 1.34 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -81,7 +81,7 @@ static int open_snd_file(demux_snd_t *this) { unsigned char header[SND_HEADER_SIZE]; unsigned int encoding; - if (xine_demux_read_header(this->input, header, SND_HEADER_SIZE) != SND_HEADER_SIZE) + if (_x_demux_read_header(this->input, header, SND_HEADER_SIZE) != SND_HEADER_SIZE) return 0; /* check the signature */ @@ -165,7 +165,7 @@ static int demux_snd_send_chunk(demux_plugin_t *this_gen) { current_pts /= this->audio_bytes_per_second; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, current_pts, 0); + _x_demux_control_newpts(this->stream, current_pts, 0); this->seek_flag = 0; } @@ -218,7 +218,7 @@ static void demux_snd_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo && this->audio_type) { @@ -239,7 +239,7 @@ static int demux_snd_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -327,7 +327,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 7f3773e7e..924e2bf18 100644 --- a/src/demuxers/demux_str.c +++ b/src/demuxers/demux_str.c @@ -24,7 +24,7 @@ * This demuxer handles either raw STR files (which are just a concatenation * of raw compact disc sectors) or STR files with RIFF headers. * - * $Id: demux_str.c,v 1.16 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_str.c,v 1.17 2003/11/11 18:44:53 f1rmb Exp $ */ /* @@ -363,7 +363,7 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) { buf->pts = frame_number * FRAME_DURATION; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, buf->pts, 0); + _x_demux_control_newpts(this->stream, buf->pts, 0); this->seek_flag = 0; } @@ -408,7 +408,7 @@ static int demux_str_send_chunk(demux_plugin_t *this_gen) { ((sector[0x13] & 0x04) ? 18900 : 37800); if (this->seek_flag) { - xine_demux_control_newpts(this->stream, buf->pts, 0); + _x_demux_control_newpts(this->stream, buf->pts, 0); this->seek_flag = 0; } @@ -441,7 +441,7 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* load stream information */ xine_set_stream_info(this->stream, XINE_STREAM_INFO_SEEKABLE, 1); @@ -503,7 +503,7 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) { static int demux_str_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { demux_str_t *this = (demux_str_t *) this_gen; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* round to ensure we start on a sector */ start_pos /= CD_RAW_SECTOR_SIZE; @@ -584,7 +584,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 42f4b7e45..32684664a 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.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: demux_ts.c,v 1.92 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_ts.c,v 1.93 2003/11/11 18:44:53 f1rmb Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -343,10 +343,10 @@ static void check_newpts( demux_ts_t *this, int64_t pts, int video ) (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) { if (this->buf_flag_seek) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->buf_flag_seek = 0; } else { - xine_demux_control_newpts(this->stream, pts, 0); + _x_demux_control_newpts(this->stream, pts, 0); } this->send_newpts = 0; this->last_pts[1-video] = 0; @@ -1755,7 +1755,7 @@ static void demux_ts_send_headers (demux_plugin_t *this_gen) { this->audioPid = INVALID_PID; this->media_num= 0; - xine_demux_control_start (this->stream); + _x_demux_control_start (this->stream); this->input->seek (this->input, 0, SEEK_SET); @@ -1817,7 +1817,7 @@ static int demux_ts_seek (demux_plugin_t *this_gen, } else { this->buf_flag_seek = 1; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } @@ -1873,7 +1873,7 @@ static int demux_ts_get_optional_data(demux_plugin_t *this_gen, } else { - sprintf(str, "%3i", xine_get_audio_channel(this->stream)); + sprintf(str, "%3i", _x_get_audio_channel(this->stream)); } return DEMUX_OPTIONAL_SUCCESS; @@ -1914,7 +1914,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, int i, j; int try_again, ts_detected; - if (!xine_demux_read_header(input, buf, 2069)) + if (!_x_demux_read_header(input, buf, 2069)) return NULL; ts_detected = 0; @@ -1950,7 +1950,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, /* check extension */ extensions = class_gen->get_extensions (class_gen); - if (xine_demux_check_extension (mrl, extensions)) + if (_x_demux_check_extension (mrl, extensions)) break; /* accept dvb streams */ diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index 0be32d8a7..3948e25b3 100644 --- a/src/demuxers/demux_voc.c +++ b/src/demuxers/demux_voc.c @@ -25,7 +25,7 @@ * It will only play that block if it is PCM data. More variations will be * supported as they are encountered. * - * $Id: demux_voc.c,v 1.33 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_voc.c,v 1.34 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -83,7 +83,7 @@ static int open_voc_file(demux_voc_t *this) { off_t first_block_offset; signed char sample_rate_divisor; - if (xine_demux_read_header(this->input, header, VOC_HEADER_SIZE) != VOC_HEADER_SIZE) + if (_x_demux_read_header(this->input, header, VOC_HEADER_SIZE) != VOC_HEADER_SIZE) return 0; /* check the signature */ @@ -152,7 +152,7 @@ static int demux_voc_send_chunk(demux_plugin_t *this_gen) { current_pts /= this->audio_sample_rate; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, current_pts, 0); + _x_demux_control_newpts(this->stream, current_pts, 0); this->seek_flag = 0; } @@ -212,7 +212,7 @@ static void demux_voc_send_headers(demux_plugin_t *this_gen) { this->audio_bits); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo && this->audio_type) { @@ -233,7 +233,7 @@ static int demux_voc_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -321,7 +321,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 2a7b237a8..6aaa6059a 100644 --- a/src/demuxers/demux_vox.c +++ b/src/demuxers/demux_vox.c @@ -22,7 +22,7 @@ * VOX Demuxer by Mike Melanson (melanson@pcisys.net) * This a demuxer for .vox files containing raw Dialogic ADPCM data. * - * $Id: demux_vox.c,v 1.8 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_vox.c,v 1.9 2003/11/11 18:44:53 f1rmb Exp $ * */ @@ -118,7 +118,7 @@ static void demux_vox_send_headers(demux_plugin_t *this_gen) { xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo) { @@ -141,7 +141,7 @@ static int demux_vox_seek (demux_plugin_t *this_gen, off_t start_pos, int start_ if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; @@ -196,7 +196,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) + if (!_x_demux_check_extension (mrl, extensions)) return NULL; } break; diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index e22ed7bc9..05df44bc2 100644 --- a/src/demuxers/demux_vqa.c +++ b/src/demuxers/demux_vqa.c @@ -29,7 +29,7 @@ * block needs information from the previous audio block in order to be * decoded, thus making random seeking difficult. * - * $Id: demux_vqa.c,v 1.34 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_vqa.c,v 1.35 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -99,7 +99,7 @@ static int open_vqa_file(demux_vqa_t *this) { xine_bmiheader *bih = (xine_bmiheader *)this->bih; unsigned char *vqa_header = this->bih + sizeof(xine_bmiheader); - if (xine_demux_read_header(this->input, scratch, 12) != 12) + if (_x_demux_read_header(this->input, scratch, 12) != 12) return 0; /* check for the VQA signatures */ @@ -270,7 +270,7 @@ static void demux_vqa_send_headers(demux_plugin_t *this_gen) { this->wave.wBitsPerSample); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -367,7 +367,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index 830f94e94..195c3d116 100644 --- a/src/demuxers/demux_wav.c +++ b/src/demuxers/demux_wav.c @@ -22,7 +22,7 @@ * MS WAV File Demuxer by Mike Melanson (melanson@pcisys.net) * based on WAV specs that are available far and wide * - * $Id: demux_wav.c,v 1.50 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_wav.c,v 1.51 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -81,7 +81,7 @@ static int open_wav_file(demux_wav_t *this) { uint8_t chunk_preamble[8]; /* check the signature */ - if (xine_demux_read_header(this->input, signature, WAV_SIGNATURE_SIZE) != WAV_SIGNATURE_SIZE) + if (_x_demux_read_header(this->input, signature, WAV_SIGNATURE_SIZE) != WAV_SIGNATURE_SIZE) return 0; if ((signature[0] != 'R') || @@ -113,8 +113,8 @@ static int open_wav_file(demux_wav_t *this) { free (this->wave); return 0; } - xine_waveformatex_le2me(this->wave); - this->audio_type = formattag_to_buf_audio(this->wave->wFormatTag); + _x_waveformatex_le2me(this->wave); + this->audio_type = _x_formattag_to_buf_audio(this->wave->wFormatTag); if(!this->audio_type) { this->audio_type = BUF_AUDIO_UNKNOWN; } @@ -195,7 +195,7 @@ static int demux_wav_send_chunk(demux_plugin_t *this_gen) { current_pts /= this->wave->nAvgBytesPerSec; if (this->seek_flag) { - xine_demux_control_newpts(this->stream, current_pts, 0); + _x_demux_control_newpts(this->stream, current_pts, 0); this->seek_flag = 0; } @@ -278,7 +278,7 @@ static void demux_wav_send_headers(demux_plugin_t *this_gen) { this->wave->wBitsPerSample); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ if (this->audio_fifo && this->audio_type) { @@ -302,7 +302,7 @@ static int demux_wav_seek (demux_plugin_t *this_gen, this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if input is non-seekable, do not proceed with the rest of this * seek function */ @@ -392,7 +392,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index c5767c48f..45b357459 100644 --- a/src/demuxers/demux_wc3movie.c +++ b/src/demuxers/demux_wc3movie.c @@ -24,7 +24,7 @@ * For more information on the MVE file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_wc3movie.c,v 1.43 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_wc3movie.c,v 1.44 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -172,7 +172,7 @@ static int demux_mve_send_chunk(demux_plugin_t *this_gen) { if (this->seek_flag) { /* reset pts */ this->video_pts = 0; - xine_demux_control_newpts(this->stream, 0, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, 0, BUF_FLAG_SEEK); this->seek_flag = 0; } else { /* record the offset of the SHOT chunk */ @@ -311,7 +311,7 @@ static void demux_mve_send_headers(demux_plugin_t *this_gen) { this->wave.wBitsPerSample); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -357,7 +357,7 @@ static int open_mve_file(demux_mve_t *this) { unsigned char header[WC3_HEADER_SIZE]; void *title; - if (xine_demux_read_header(this->input, header, WC3_HEADER_SIZE) != WC3_HEADER_SIZE) + if (_x_demux_read_header(this->input, header, WC3_HEADER_SIZE) != WC3_HEADER_SIZE) return 0; if ((BE_32(&header[0]) != FORM_TAG) || @@ -537,7 +537,7 @@ static int demux_mve_seek (demux_plugin_t *this_gen, start_time /= 1000; this->status = DEMUX_OK; - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); this->seek_flag = 1; /* if input is non-seekable, do not proceed with the rest of this @@ -684,7 +684,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index e5842378d..b2f6221d5 100644 --- a/src/demuxers/demux_yuv4mpeg2.c +++ b/src/demuxers/demux_yuv4mpeg2.c @@ -24,7 +24,7 @@ * tools, visit: * http://mjpeg.sourceforge.net/ * - * $Id: demux_yuv4mpeg2.c,v 1.29 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.30 2003/11/11 18:44:53 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -91,7 +91,7 @@ static int open_yuv4mpeg2_file(demux_yuv4mpeg2_t *this) { this->aspect_n = this->aspect_d = this->progressive = this->top_field_first = this->data_start = 0; - if (xine_demux_read_header(this->input, header, Y4M_HEADER_BYTES) != Y4M_HEADER_BYTES) + if (_x_demux_read_header(this->input, header, Y4M_HEADER_BYTES) != Y4M_HEADER_BYTES) return 0; /* check for the Y4M signature */ @@ -258,7 +258,7 @@ static int demux_yuv4mpeg2_send_chunk(demux_plugin_t *this_gen) { /* reset the pts after a seek */ if (this->seek_flag) { - xine_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK); this->seek_flag = 0; } @@ -309,7 +309,7 @@ static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) { this->bih.biHeight); /* send start buffers */ - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); /* send init info to decoders */ buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); @@ -349,13 +349,13 @@ static int demux_yuv4mpeg2_seek (demux_plugin_t *this_gen, this->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); /* if thread is not running, initialize demuxer */ if( !this->stream->demux_thread_running ) { /* send new pts */ - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_control_newpts(this->stream, 0, 0); this->status = DEMUX_OK; } @@ -422,7 +422,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str mrl = input->get_mrl (input); extensions = class_gen->get_extensions (class_gen); - if (!xine_demux_check_extension (mrl, extensions)) { + if (!_x_demux_check_extension (mrl, extensions)) { free (this); return NULL; } diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index e92498847..fa711c81e 100644 --- a/src/demuxers/demux_yuv_frames.c +++ b/src/demuxers/demux_yuv_frames.c @@ -20,7 +20,7 @@ */ /* - * $Id: demux_yuv_frames.c,v 1.9 2003/10/31 22:56:21 tmattern Exp $ + * $Id: demux_yuv_frames.c,v 1.10 2003/11/11 18:44:53 f1rmb Exp $ * * dummy demultiplexer for raw yuv frames (delivered by v4l) */ @@ -78,9 +78,9 @@ static int switch_buf(demux_yuv_frames_t *this , buf_element_t *buf){ if (this->seek_flag) { this->seek_flag = 0; - xine_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK); + _x_demux_control_newpts(this->stream, buf->pts, BUF_FLAG_SEEK); } else if (abs(this->last_pts - buf->pts) > WRAP_THRESHOLD) { - xine_demux_control_newpts(this->stream, buf->pts, 0); + _x_demux_control_newpts(this->stream, buf->pts, 0); } this->last_pts = buf->pts; @@ -92,7 +92,7 @@ static int switch_buf(demux_yuv_frames_t *this , buf_element_t *buf){ break; case BUF_AUDIO_RAWPCM: if (!xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) - xine_demux_control_newpts(this->stream, buf->pts, 0); + _x_demux_control_newpts(this->stream, buf->pts, 0); this->audio_fifo->put(this->audio_fifo, buf); break; default: diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 189ea40c3..d487753fb 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.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_dxr3.c,v 1.90 2003/10/23 21:01:44 mroi Exp $ + * $Id: video_out_dxr3.c,v 1.91 2003/11/11 18:44:53 f1rmb Exp $ */ /* mpeg1 encoding video out plugin for the dxr3. @@ -263,7 +263,7 @@ static vo_driver_t *dxr3_vo_open_plugin(video_driver_class_t *class_gen, const v pthread_mutex_init(&this->video_device_lock, NULL); pthread_mutex_init(&this->spu_device_lock, NULL); - vo_scale_init(&this->scale, 0, 0, config); + _x_vo_scale_init(&this->scale, 0, 0, config); this->class = class; this->swap_fields = config->register_bool(config, @@ -905,7 +905,7 @@ static void dxr3_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen) this->scale.user_ratio = (this->widescreen_enabled ? frame->aspect : XINE_VO_ASPECT_4_3); this->scale.force_redraw = 1; - vo_scale_compute_ideal_size(&this->scale); + _x_vo_scale_compute_ideal_size(&this->scale); /* prepare the overlay window */ dxr3_overlay_update(this); @@ -1123,8 +1123,8 @@ static int dxr3_gui_data_exchange(vo_driver_t *this_gen, int data_type, void *da { int x1, y1, x2, y2; x11_rectangle_t *rect = data; - vo_scale_translate_gui2video(&this->scale, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2); + _x_vo_scale_translate_gui2video(&this->scale, rect->x, rect->y, &x1, &y1); + _x_vo_scale_translate_gui2video(&this->scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1 - this->top_bar; rect->w = x2 - x1; @@ -1437,10 +1437,10 @@ static int dxr3_overlay_set_attributes(dxr3_overlay_t *this) static void dxr3_overlay_update(dxr3_driver_t *this) { - if (vo_scale_redraw_needed(&this->scale)) { + if (_x_vo_scale_redraw_needed(&this->scale)) { em8300_overlay_window_t win; - vo_scale_compute_output_size(&this->scale); + _x_vo_scale_compute_output_size(&this->scale); /* fill video window with keycolor */ XLockDisplay(this->display); diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 9498c9f5a..dff92f57f 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -18,7 +18,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: input_dvd.c,v 1.170 2003/11/08 22:39:32 tmattern Exp $ + * $Id: input_dvd.c,v 1.171 2003/11/11 18:44:53 f1rmb Exp $ * */ @@ -558,7 +558,7 @@ static buf_element_t *dvd_plugin_read_block (input_plugin_t *this_gen, if(result == DVDNAV_STATUS_ERR) { printf("input_dvd: Error getting next block from DVD (%s)\n", dvdnav_err_to_string(this->dvdnav)); - xine_message(this->stream, XINE_MSG_READ_ERROR, + _x_message(this->stream, XINE_MSG_READ_ERROR, dvdnav_err_to_string(this->dvdnav), NULL); if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block); buf->free_buffer(buf); @@ -701,7 +701,7 @@ static buf_element_t *dvd_plugin_read_block (input_plugin_t *this_gen, } break; case DVDNAV_HOP_CHANNEL: - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); break; case DVDNAV_NAV_PACKET: { @@ -1378,7 +1378,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { if(ret == DVDNAV_STATUS_ERR) { if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) printf("input_dvd: Error opening DVD device\n"); - xine_message (this->stream, XINE_MSG_READ_ERROR, + _x_message (this->stream, XINE_MSG_READ_ERROR, intended_dvd_device, NULL); return 0; } @@ -1390,7 +1390,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) { if(ret == DVDNAV_STATUS_ERR) { if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) printf("input_dvd: Error opening DVD device\n"); - xine_message (this->stream, XINE_MSG_READ_ERROR, + _x_message (this->stream, XINE_MSG_READ_ERROR, intended_dvd_device, NULL); return 0; } @@ -1727,6 +1727,9 @@ static void *init_class (xine_t *xine, void *data) { /* * $Log: input_dvd.c,v $ + * Revision 1.171 2003/11/11 18:44:53 f1rmb + * rename internal API function (_x_<function>). + * * Revision 1.170 2003/11/08 22:39:32 tmattern * Use info helper functions. * @@ -1939,7 +1942,7 @@ static void *init_class (xine_t *xine, void *data) { * * Revision 1.124 2002/12/22 23:35:42 miguelfreitas * it doesn't make sense to reimplement flush here. - * (this is why xine_demux_flush_engine was created, to avoid redundant code) + * (this is why _x_demux_flush_engine was created, to avoid redundant code) * * Revision 1.123 2002/12/21 12:56:47 miguelfreitas * - add buf->decoder_info_ptr: portability for systems where pointer has @@ -2137,7 +2140,7 @@ static void *init_class (xine_t *xine, void *data) { * Revision 1.73 2002/09/05 05:51:14 jcdutton * XV Video out at least loads now and we see the xine logo again. * The DVD plugin now loads, but audio and spu info is lost. - * What happened to xine_get_spu_channel and xine_get_audio_channel? + * What happened to _x_get_spu_channel and _x_get_audio_channel? * * Revision 1.72 2002/09/04 23:31:08 guenter * merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-) diff --git a/src/input/input_file.c b/src/input/input_file.c index 1e053cb51..c0e476413 100644 --- a/src/input/input_file.c +++ b/src/input/input_file.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: input_file.c,v 1.85 2003/10/26 10:48:24 mroi Exp $ + * $Id: input_file.c,v 1.86 2003/11/11 18:44:54 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -119,7 +119,7 @@ static buf_element_t *file_plugin_read_block (input_plugin_t *this_gen, fifo_buf if (num_bytes < 0) { xine_log (this->stream->xine, XINE_LOG_MSG, _("input_file: read error (%s)\n"), strerror(errno)); - xine_message(this->stream, XINE_MSG_READ_ERROR, + _x_message(this->stream, XINE_MSG_READ_ERROR, this->mrl, NULL); } buf->free_buffer (buf); diff --git a/src/input/input_http.c b/src/input/input_http.c index 9debf821f..3cf37526b 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.66 2003/11/08 22:20:36 tmattern Exp $ + * $Id: input_http.c,v 1.67 2003/11/11 18:44:54 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -431,10 +431,10 @@ static off_t http_plugin_read (input_plugin_t *this_gen, if( n && this->shoutcast_mode) { if ((this->shoutcast_pos + n) >= this->shoutcast_metaint) { int i = this->shoutcast_metaint - this->shoutcast_pos; - i = xio_tcp_read (this->stream, this->fh, &buf[num_bytes], i); + i = _x_io_tcp_read (this->stream, this->fh, &buf[num_bytes], i); if (i < 0) { if (!this->stream->demux_action_pending) - xine_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL); + _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno); return 0; } @@ -450,12 +450,12 @@ static off_t http_plugin_read (input_plugin_t *this_gen, } if( n ) { - n = xio_tcp_read (this->stream, this->fh, &buf[num_bytes], n); + n = _x_io_tcp_read (this->stream, this->fh, &buf[num_bytes], n); /* read errors */ if (n < 0) { if (!this->stream->demux_action_pending) - xine_message(this->stream, XINE_MSG_READ_ERROR, this->host, NULL); + _x_message(this->stream, XINE_MSG_READ_ERROR, this->host, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno); return 0; } @@ -695,7 +695,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { if (http_plugin_basicauth (this_klass->proxyuser, this_klass->proxypassword, this->proxyauth, BUFSIZE)) { - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL); + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL); return 0; } } @@ -710,7 +710,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { if ( (this->user != NULL) && strcmp (this_klass->proxyhost, "")) if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) { - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL); + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL); return 0; } @@ -727,9 +727,9 @@ static int http_plugin_open (input_plugin_t *this_gen ) { #endif if ( (this_klass->proxyhost != NULL) && strcmp (this_klass->proxyhost, "") ) - this->fh = xio_tcp_connect (this->stream, this_klass->proxyhost, this_klass->proxyport); + this->fh = _x_io_tcp_connect (this->stream, this_klass->proxyhost, this_klass->proxyport); else - this->fh = xio_tcp_connect (this->stream, this->host, this->port); + this->fh = _x_io_tcp_connect (this->stream, this->host, this->port); this->curpos = 0; @@ -741,7 +741,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { progress = 0; do { report_progress(this->stream, progress); - res = xio_select (this->stream, this->fh, XIO_WRITE_READY, 500); + res = _x_io_select (this->stream, this->fh, XIO_WRITE_READY, 500); progress += 2; } while ((res == XIO_TIMEOUT) && (progress < 100)); if (res != XIO_READY) @@ -782,8 +782,8 @@ static int http_plugin_open (input_plugin_t *this_gen ) { strcat (this->buf, "\015\012"); length = strlen(this->buf); - if (xio_tcp_write (this->stream, this->fh, this->buf, length) != length) { - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL); + if (_x_io_tcp_write (this->stream, this->fh, this->buf, length) != length) { + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL); printf ("input_http: couldn't send request\n"); return 0; } @@ -802,7 +802,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { printf ("input_http: read...\n"); */ - if (xio_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) { + if (_x_io_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) { return 0; } @@ -831,7 +831,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { /* icecast ? */ if (sscanf(this->buf, "ICY %d OK", &httpcode) != 1) { - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL); + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: invalid http answer\n")); return 0; @@ -846,7 +846,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { _("input_http: 3xx redirection: >%d %s<\n"), httpcode, httpstatus); } else if (httpcode < 200 || httpcode >= 300) { - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ", + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ", httpstatus, NULL); xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: http status not 2xx: >%d %s<\n"), @@ -909,7 +909,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) { this->mrlbuf2[3] = ' '; if (read_shoutcast_header(this)) { /* problem when reading shoutcast header */ - xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "can't read shoutcast header", NULL); + _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "can't read shoutcast header", NULL); printf ("can't read shoutcast header\n"); return 0; } diff --git a/src/input/input_net.c b/src/input/input_net.c index cac1fcc1b..17854b86b 100644 --- a/src/input/input_net.c +++ b/src/input/input_net.c @@ -20,7 +20,7 @@ * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the * other end and you can watch tv anywhere in the house ..) * - * $Id: input_net.c,v 1.53 2003/10/26 10:48:24 mroi Exp $ + * $Id: input_net.c,v 1.54 2003/11/11 18:44:54 f1rmb Exp $ * * how to set up mp1e for use with this plugin: * @@ -274,7 +274,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen, } if( (len-total) > 0 ) { - n = xine_read_abort (this->stream, this->fh, &buf[total], len-total); + n = _x_read_abort (this->stream, this->fh, &buf[total], len-total); #ifdef LOG printf ("input_net: got %lld bytes (%lld/%lld bytes read)\n", @@ -282,7 +282,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen, #endif if (n < 0) { - xine_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL); + _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL); return 0; } diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c index 6fef52cbf..6c3fd0c0f 100644 --- a/src/input/input_pvr.c +++ b/src/input/input_pvr.c @@ -38,7 +38,7 @@ * usage: * xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age> * - * $Id: input_pvr.c,v 1.33 2003/09/02 14:29:29 miguelfreitas Exp $ + * $Id: input_pvr.c,v 1.34 2003/11/11 18:44:54 f1rmb Exp $ */ /************************************************************************** @@ -798,7 +798,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t /* now we are done on input/demuxer thread, engine may be paused safely */ if( this->pvr_play_paused ) { - xine_set_speed (this->stream, XINE_SPEED_PAUSE); + _x_set_speed (this->stream, XINE_SPEED_PAUSE); this->pvr_play_paused = 0; } @@ -1020,7 +1020,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { pvrscr_speed_tunning(this->scr, 1.0 ); pvr_break_rec_page(this); pthread_mutex_unlock(&this->lock); - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); } else { /* no session change, break the page and store a new show_time */ pthread_mutex_lock(&this->lock); @@ -1079,7 +1079,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) { pthread_mutex_unlock(&this->dev_lock); /* FIXME: also flush the device */ - /* xine_demux_flush_engine(this->stream); */ + /* _x_demux_flush_engine(this->stream); */ } break; diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c index 5a406e811..ccbd5bfe4 100644 --- a/src/input/input_stdin_fifo.c +++ b/src/input/input_stdin_fifo.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: input_stdin_fifo.c,v 1.52 2003/11/08 22:21:48 tmattern Exp $ + * $Id: input_stdin_fifo.c,v 1.53 2003/11/11 18:44:54 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -96,7 +96,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen, } if( (len-total) > 0 ) { - n = xio_file_read (this->stream, this->fh, &buf[total], len - total); + n = _x_io_file_read (this->stream, this->fh, &buf[total], len - total); #ifdef LOG printf ("stdin: got %lld bytes (%lld/%lld bytes read)\n", @@ -104,7 +104,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen, #endif if (n < 0) { - xine_message(this->stream, XINE_MSG_READ_ERROR, NULL); + _x_message(this->stream, XINE_MSG_READ_ERROR, NULL); return 0; } diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c index 23b559170..783c6a52b 100644 --- a/src/input/input_v4l.c +++ b/src/input/input_v4l.c @@ -1522,7 +1522,7 @@ static void v4l_event_handler (v4l_input_plugin_t *this) { (float)v4l2_data->frequency); set_frequency(this, this->frequency); - xine_demux_flush_engine(this->stream); + _x_demux_flush_engine(this->stream); } break; /* default: diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c index 89d693b7c..17df49179 100644 --- a/src/input/librtsp/rtsp.c +++ b/src/input/librtsp/rtsp.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: rtsp.c,v 1.10 2003/04/13 19:02:07 miguelfreitas Exp $ + * $Id: rtsp.c,v 1.11 2003/11/11 18:44:54 f1rmb Exp $ * * a minimalistic implementation of rtsp protocol, * *not* RFC 2326 compilant yet. @@ -211,7 +211,7 @@ static ssize_t read_stream(rtsp_t *s, void *buf, size_t count) { return total; #else - return xine_read_abort(s->stream, s->s, buf, count ); + return _x_read_abort(s->stream, s->s, buf, count ); #endif } diff --git a/src/input/mms.c b/src/input/mms.c index 8286f2119..a5322223d 100644 --- a/src/input/mms.c +++ b/src/input/mms.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: mms.c,v 1.34 2003/10/16 21:47:32 tmattern Exp $ + * $Id: mms.c,v 1.35 2003/11/11 18:44:54 f1rmb Exp $ * * MMS over TCP protocol * based on work from major mms @@ -353,7 +353,7 @@ static int get_answer (mms_t *this) { off_t len; uint32_t length; - len = xio_tcp_read (this->stream, this->s, this->buf, 12); + len = _x_io_tcp_read (this->stream, this->s, this->buf, 12); if (len < 0) { lprintf ("get_answer: read error\n"); return 0; @@ -370,7 +370,7 @@ static int get_answer (mms_t *this) { return 0; } - len = xio_tcp_read (this->stream, this->s, this->buf + 12, length + 4) ; + len = _x_io_tcp_read (this->stream, this->s, this->buf + 12, length + 4) ; if (len < 0) { lprintf ("get_answer: read error\n"); return 0; @@ -406,7 +406,7 @@ static int get_header (mms_t *this) { while (1) { - len = xio_tcp_read (this->stream, this->s, pre_header, 8) ; + len = _x_io_tcp_read (this->stream, this->s, pre_header, 8) ; if (len < 0) { lprintf ("get_header: read error\n"); return 0; @@ -438,7 +438,7 @@ static int get_header (mms_t *this) { return 0; } - len = xio_tcp_read (this->stream, this->s, &this->asf_header[this->asf_header_len], packet_len); + len = _x_io_tcp_read (this->stream, this->s, &this->asf_header[this->asf_header_len], packet_len); if (len < 0) { lprintf ("get_header: read error\n"); return 0; @@ -461,7 +461,7 @@ static int get_header (mms_t *this) { uint32_t packet_len; int command; - len = xio_tcp_read (this->stream, this->s, (uint8_t *) &packet_len, 4); + len = _x_io_tcp_read (this->stream, this->s, (uint8_t *) &packet_len, 4); if (len < 0) { lprintf ("get_header: read error\n"); return 0; @@ -479,7 +479,7 @@ static int get_header (mms_t *this) { return 0; } - len = xio_tcp_read (this->stream, this->s, this->buf, packet_len); + len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len); if (len < 0) { lprintf ("get_header: read error\n"); return 0; @@ -697,7 +697,7 @@ static int mms_tcp_connect(mms_t *this) { * try to connect */ lprintf("try to connect to %s on port %d \n", this->host, this->port); - this->s = xio_tcp_connect (this->stream, this->host, this->port); + this->s = _x_io_tcp_connect (this->stream, this->host, this->port); if (this->s == -1) { @@ -709,7 +709,7 @@ static int mms_tcp_connect(mms_t *this) { progress = 0; do { report_progress(this->stream, progress); - res = xio_select (this->stream, this->s, XIO_WRITE_READY, 500); + res = _x_io_select (this->stream, this->s, XIO_WRITE_READY, 500); progress += 1; } while ((res == XIO_TIMEOUT) && (progress < 30)); if (res != XIO_READY) { @@ -1033,7 +1033,7 @@ static int get_media_packet (mms_t *this) { unsigned char pre_header[8]; off_t len; - len = xio_tcp_read (this->stream, this->s, pre_header, 8) ; + len = _x_io_tcp_read (this->stream, this->s, pre_header, 8) ; if (len < 0) { lprintf ("get_media_packet: read error\n"); return 0; @@ -1063,7 +1063,7 @@ static int get_media_packet (mms_t *this) { return 0; } - len = xio_tcp_read (this->stream, this->s, this->buf, packet_len); + len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len); if (len < 0) { lprintf ("get_media_packet: read error\n"); return 0; @@ -1082,7 +1082,7 @@ static int get_media_packet (mms_t *this) { int command; this->buf_size = 0; - len = xio_tcp_read (this->stream, this->s, (uint8_t *)&packet_len, 4); + len = _x_io_tcp_read (this->stream, this->s, (uint8_t *)&packet_len, 4); if (len < 0) { lprintf ("get_media_packet: read error\n"); return 0; @@ -1099,7 +1099,7 @@ static int get_media_packet (mms_t *this) { return 0; } - len = xio_tcp_read (this->stream, this->s, this->buf, packet_len); + len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len); if (len < 0) { lprintf ("\nlibmms: get_media_packet: read error\n"); return 0; diff --git a/src/input/mmsh.c b/src/input/mmsh.c index 1670b3789..9598ecf7a 100644 --- a/src/input/mmsh.c +++ b/src/input/mmsh.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: mmsh.c,v 1.19 2003/10/31 01:55:03 tmattern Exp $ + * $Id: mmsh.c,v 1.20 2003/11/11 18:44:54 f1rmb Exp $ * * MMS over HTTP protocol * written by Thibaut Mattern @@ -255,7 +255,7 @@ static int send_command (mmsh_t *this, char *cmd) { printf ("libmmsh: send_command:\n%s\n", cmd); #endif length = strlen(cmd); - if (xio_tcp_write(this->stream, this->s, cmd, length) != length) { + if (_x_io_tcp_write(this->stream, this->s, cmd, length) != length) { printf ("libmmsh: send error\n"); return 0; } @@ -275,7 +275,7 @@ static int get_answer (mmsh_t *this) { while (!done) { - if (xio_tcp_read(this->stream, this->s, &(this->buf[len]), 1) != 1) { + if (_x_io_tcp_read(this->stream, this->s, &(this->buf[len]), 1) != 1) { printf ("libmmsh: alert: end of stream\n"); return 0; } @@ -368,7 +368,7 @@ static int get_chunk_header (mmsh_t *this) { printf ("libmmsh: get_chunk\n"); #endif /* chunk header */ - len = xio_tcp_read(this->stream, this->s, chunk_header, CHUNK_HEADER_LENGTH); + len = _x_io_tcp_read(this->stream, this->s, chunk_header, CHUNK_HEADER_LENGTH); if (len != CHUNK_HEADER_LENGTH) { #ifdef LOG printf ("libmmsh: chunk header read failed, %d != %d\n", len, CHUNK_HEADER_LENGTH); @@ -415,7 +415,7 @@ static int get_header (mmsh_t *this) { printf ("libmmsh: the asf header exceed %d bytes\n", ASF_HEADER_SIZE); return 0; } else { - len = xio_tcp_read(this->stream, this->s, this->asf_header + this->asf_header_len, + len = _x_io_tcp_read(this->stream, this->s, this->asf_header + this->asf_header_len, this->chunk_length); this->asf_header_len += len; if (len != this->chunk_length) { @@ -431,7 +431,7 @@ static int get_header (mmsh_t *this) { } /* read the first data chunk */ - len = xio_tcp_read(this->stream, this->s, this->buf, this->chunk_length); + len = _x_io_tcp_read(this->stream, this->s, this->buf, this->chunk_length); if (len != this->chunk_length) { return 0; } else { @@ -663,7 +663,7 @@ static int mmsh_tcp_connect(mmsh_t *this) { #ifdef LOG printf("libmmsh: try to connect to %s on port %d \n", this->host, this->port); #endif - this->s = xio_tcp_connect (this->stream, this->host, this->port); + this->s = _x_io_tcp_connect (this->stream, this->host, this->port); if (this->s == -1) { printf ("libmmsh: failed to connect '%s'\n", this->host); @@ -674,7 +674,7 @@ static int mmsh_tcp_connect(mmsh_t *this) { progress = 0; do { report_progress(this->stream, progress); - res = xio_select (this->stream, this->s, XIO_WRITE_READY, 500); + res = _x_io_select (this->stream, this->s, XIO_WRITE_READY, 500); progress += 1; } while ((res == XIO_TIMEOUT) && (progress < 30)); if (res != XIO_READY) { @@ -938,7 +938,7 @@ static int get_media_packet (mmsh_t *this) { return 0; } - len = xine_read_abort (this->stream, this->s, this->buf, this->chunk_length); + len = _x_read_abort (this->stream, this->s, this->buf, this->chunk_length); if (len == this->chunk_length) { /* explicit padding with 0 */ diff --git a/src/input/pnm.c b/src/input/pnm.c index b77cc69c8..4a09efb1e 100644 --- a/src/input/pnm.c +++ b/src/input/pnm.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: pnm.c,v 1.15 2003/06/20 16:17:28 hadess Exp $ + * $Id: pnm.c,v 1.16 2003/11/11 18:44:54 f1rmb Exp $ * * pnm protocol implementation * based upon code from joschka @@ -299,7 +299,7 @@ static ssize_t rm_read(pnm_t *p, void *buf, size_t count) { return total; #else - return xine_read_abort(p->stream, p->s, buf, count ); + return _x_read_abort(p->stream, p->s, buf, count ); #endif } diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c index 966e03f7c..537c14875 100644 --- a/src/input/vcd/xineplug_inp_vcd.c +++ b/src/input/vcd/xineplug_inp_vcd.c @@ -1,5 +1,5 @@ /* - $Id: xineplug_inp_vcd.c,v 1.6 2003/10/21 16:10:31 mroi Exp $ + $Id: xineplug_inp_vcd.c,v 1.7 2003/11/11 18:44:54 f1rmb Exp $ Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com> @@ -586,7 +586,7 @@ vcd_read_ahead_cb(void *this_gen, xine_cfg_entry_t *entry) static void vcd_flush_buffers(void) { - xine_demux_flush_engine(my_vcd.stream); + _x_demux_flush_engine(my_vcd.stream); } /*! @@ -1047,7 +1047,7 @@ vcd_handle_events (void) default: LOG_MSG("%s %d\n", _("Unknown event type: "), event->type); } - xine_demux_flush_engine(my_vcd.stream); + _x_demux_flush_engine(my_vcd.stream); vcdplayer_play(this, itemid); return true; } @@ -1066,7 +1066,7 @@ vcd_handle_events (void) lid_t next_num=vcdplayer_selection2lid(this, itemid.num); if (VCDINFO_INVALID_LID != next_num) { itemid.num = next_num; - xine_demux_flush_engine(my_vcd.stream); + _x_demux_flush_engine(my_vcd.stream); vcdplayer_play(this, itemid); return true; } @@ -1126,7 +1126,7 @@ vcd_get_optional_data (input_plugin_t *this_gen, case INPUT_OPTIONAL_DATA_AUDIOLANG: { int8_t channel; - channel = (int8_t) xine_get_audio_channel(my_vcd.stream); + channel = (int8_t) _x_get_audio_channel(my_vcd.stream); dbg_print(INPUT_DBG_EXT, "AUDIO CHANNEL = %d\n", channel); if (-1 == channel) { @@ -1152,7 +1152,7 @@ vcd_get_optional_data (input_plugin_t *this_gen, { /*uint16_t lang;*/ int8_t channel; - channel = (int8_t) xine_get_spu_channel(my_vcd.stream); + channel = (int8_t) _x_get_spu_channel(my_vcd.stream); dbg_print(INPUT_DBG_EXT, "SPU CHANNEL = %d\n", channel); if (-1 == channel) { sprintf(data, " %s", "auto"); diff --git a/src/libflac/demux_flac.c b/src/libflac/demux_flac.c index 652916fd8..04722c7a8 100644 --- a/src/libflac/demux_flac.c +++ b/src/libflac/demux_flac.c @@ -301,7 +301,7 @@ demux_flac_send_chunk (demux_plugin_t *this_gen) { } if (this->seek_flag) { - xine_demux_control_newpts (this->stream, current_pts, 0); + _x_demux_control_newpts (this->stream, current_pts, 0); this->seek_flag = 0; } @@ -368,7 +368,7 @@ demux_flac_send_headers (demux_plugin_t *this_gen) { this->stream->stream_info[XINE_STREAM_INFO_AUDIO_SAMPLERATE] = this->sample_rate; this->stream->stream_info[XINE_STREAM_INFO_AUDIO_BITS] = this->bits_per_sample; - xine_demux_control_start (this->stream); + _x_demux_control_start (this->stream); if (this->audio_fifo) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); @@ -446,7 +446,7 @@ demux_flac_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { this->status = DEMUX_FINISHED; } - xine_demux_flush_engine (this->stream); + _x_demux_flush_engine (this->stream); return this->status; } diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c index a55c069a8..2861985da 100644 --- a/src/libmpeg2/decode.c +++ b/src/libmpeg2/decode.c @@ -897,7 +897,7 @@ static void process_userdata(mpeg2dec_t *mpeg2dec, uint8_t *buffer) xine_format_change_data_t data; /* open the closed caption decoder first */ - mpeg2dec->cc_dec = get_spu_decoder(mpeg2dec->stream, (BUF_SPU_CC >> 16) & 0xff); + mpeg2dec->cc_dec = _x_get_spu_decoder(mpeg2dec->stream, (BUF_SPU_CC >> 16) & 0xff); /* send a frame format event so that the CC decoder knows the initial image size */ event.type = XINE_EVENT_FRAME_FORMAT_CHANGE; diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c index 2f093b0e6..7c16a11f3 100644 --- a/src/libreal/audio_decoder.c +++ b/src/libreal/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.27 2003/10/28 20:18:06 jstembridge Exp $ + * $Id: audio_decoder.c,v 1.28 2003/11/11 18:44:54 f1rmb Exp $ * * thin layer to use real binary-only codecs in xine * @@ -133,7 +133,7 @@ static int load_syms_linux (realdec_decoder_t *this, char *codec_name) { if (!this->ra_handle) { printf ("libareal: error: %s\n", dlerror()); - xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, + _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL); return 0; } diff --git a/src/libreal/xine_decoder.c b/src/libreal/xine_decoder.c index 91b9d51e6..77dcc3f76 100644 --- a/src/libreal/xine_decoder.c +++ b/src/libreal/xine_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: xine_decoder.c,v 1.50 2003/10/23 20:12:33 mroi Exp $ + * $Id: xine_decoder.c,v 1.51 2003/11/11 18:44:54 f1rmb Exp $ * * thin layer to use real binary-only codecs in xine * @@ -131,7 +131,7 @@ static int load_syms_linux (realdec_decoder_t *this, char *codec_name) { if (!this->rv_handle) { printf ("libreal: error: %s\n", dlerror()); - xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, + _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, codec_name, NULL); return 0; } diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am index 5dd12bbf3..46256cec6 100644 --- a/src/libsputext/Makefile.am +++ b/src/libsputext/Makefile.am @@ -2,6 +2,8 @@ include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) +AM_CFLAGS = -DTOTO=`echo $* | sed -e 's/\.[csS]//g'` + if HAVE_GICONV sputext_decoder = xineplug_decode_sputext.la xineplug_decode_spuogm.la xineplug_dmx_sputext.la endif diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c index 3aecee27a..824159792 100644 --- a/src/libsputext/demux_sputext.c +++ b/src/libsputext/demux_sputext.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: demux_sputext.c,v 1.25 2003/11/04 00:24:52 f1rmb Exp $ + * $Id: demux_sputext.c,v 1.26 2003/11/11 18:44:54 f1rmb Exp $ * * code based on old libsputext/xine_decoder.c * @@ -879,8 +879,8 @@ static int demux_sputext_seek (demux_plugin_t *this_gen, this->cur = 0; this->status = DEMUX_OK; - xine_demux_flush_engine (this->stream); - xine_demux_control_newpts(this->stream, 0, 0); + _x_demux_flush_engine (this->stream); + _x_demux_control_newpts(this->stream, 0, 0); return this->status; } @@ -892,7 +892,7 @@ static void demux_sputext_send_headers(demux_plugin_t *this_gen) { lprintf("demux_sputext: send_headers() called\n"); - xine_demux_control_start(this->stream); + _x_demux_control_start(this->stream); this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0; this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0; @@ -1031,7 +1031,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) { demux_sputext_class_t *this ; lprintf("demux_sputext: initializing\n"); - + this = xine_xmalloc (sizeof (demux_sputext_class_t)); this->demux_class.open_plugin = open_demux_plugin; diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c index 553d26641..2e0157b5c 100644 --- a/src/libsputext/xine_decoder.c +++ b/src/libsputext/xine_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: xine_decoder.c,v 1.64 2003/10/23 20:12:34 mroi Exp $ + * $Id: xine_decoder.c,v 1.65 2003/11/11 18:44:54 f1rmb Exp $ * */ @@ -238,7 +238,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { start += (spu_offset / 90); end += (spu_offset / 90); - xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); + _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); if( !this->seek_count ) { this->seek_count = extra_info.seek_count; @@ -345,7 +345,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { xine_usec_sleep (50000); - xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); + _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); } #ifdef LOG printf("libsputext: seek_count mismatch\n"); diff --git a/src/libsputext/xine_decoder_ogm.c b/src/libsputext/xine_decoder_ogm.c index f4dfe838c..98cee9746 100644 --- a/src/libsputext/xine_decoder_ogm.c +++ b/src/libsputext/xine_decoder_ogm.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_decoder_ogm.c,v 1.6 2003/10/23 20:12:34 mroi Exp $ + * $Id: xine_decoder_ogm.c,v 1.7 2003/11/11 18:44:55 f1rmb Exp $ * */ @@ -331,7 +331,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { start += (spu_offset / 90); end += (spu_offset / 90); - xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); + _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); if( !this->seek_count ) { this->seek_count = extra_info.seek_count; @@ -405,7 +405,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) { xine_usec_sleep (50000); - xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); + _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) ); } #ifdef LOG printf("libspuogm: seek_count mismatch\n"); diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c index b1f9c0851..d75ef67fc 100644 --- a/src/libw32dll/qt_decoder.c +++ b/src/libw32dll/qt_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: qt_decoder.c,v 1.22 2003/10/23 20:12:34 mroi Exp $ + * $Id: qt_decoder.c,v 1.23 2003/11/11 18:44:55 f1rmb Exp $ * * quicktime video/audio decoder plugin, using win32 dlls * most of this code comes directly from MPlayer @@ -242,7 +242,7 @@ static void qta_init_driver (qta_decoder_t *this, buf_element_t *buf) { if (this->qtml_dll == NULL ) { printf ("qt_audio: failed to load dll\n" ); pthread_mutex_unlock(&win32_codec_mutex); - xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, + _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, "qtmlClient.dll", NULL); return; } @@ -818,7 +818,7 @@ static void qtv_init_driver (qtv_decoder_t *this, buf_element_t *buf) { if (this->qtml_dll == NULL ) { printf ("qt_video: failed to load dll\n" ); pthread_mutex_unlock(&win32_codec_mutex); - xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, + _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, "qtmlClient.dll", NULL); return; } diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 7c5f021e9..464d6c1c2 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.127 2003/10/23 20:12:34 mroi Exp $ + * $Id: w32codec.c,v 1.128 2003/11/11 18:44:55 f1rmb Exp $ * * routines for using w32 codecs * DirectShow support by Miguel Freitas (Nov/2001) @@ -740,7 +740,7 @@ static void w32v_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { "w32codec: decoder failed to start. Is '%s' installed?\n", win32_codec_name ); this->stream->stream_info[XINE_STREAM_INFO_VIDEO_HANDLED] = 0; - xine_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, + _x_message(this->stream, XINE_MSG_LIBRARY_LOAD_ERROR, win32_codec_name, NULL); } diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c index e262f79c8..7be9eab54 100644 --- a/src/libw32dll/wine/registry.c +++ b/src/libw32dll/wine/registry.c @@ -15,6 +15,10 @@ #include "ext.h" #include "registry.h" +#ifdef XINE_MAJOR +#include "xineutils.h" +#endif + //#undef TRACE //#define TRACE printf diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c index 2589c5848..949be9579 100644 --- a/src/post/deinterlace/xine_plugin.c +++ b/src/post/deinterlace/xine_plugin.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_plugin.c,v 1.21 2003/11/01 18:34:22 miguelfreitas Exp $ + * $Id: xine_plugin.c,v 1.22 2003/11/11 18:44:56 f1rmb Exp $ * * advanced video deinterlacer plugin * Jun/2003 by Miguel Freitas @@ -420,7 +420,7 @@ static post_plugin_t *deinterlace_open_plugin(post_class_t *class_gen, int input set_parameters ((xine_post_t *)&this->post, &class->init_param); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = deinterlace_open; port->port.get_frame = deinterlace_get_frame; @@ -583,7 +583,7 @@ static vo_frame_t *deinterlace_get_frame(xine_video_port_t *port_gen, uint32_t w if( this->enabled && this->cur_method && (flags & VO_INTERLACED_FLAG) && (format == XINE_IMGFMT_YV12 || format == XINE_IMGFMT_YUY2) ) { - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = deinterlace_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -639,7 +639,7 @@ static int deinterlace_draw(vo_frame_t *frame, xine_stream_t *stream) vo_frame_t *yuy2_frame; int i, skip, progressive = 0; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); frame->flags &= ~VO_INTERLACED_FLAG; /* this should be used to detect any special rff pattern */ @@ -663,7 +663,7 @@ static int deinterlace_draw(vo_frame_t *frame, xine_stream_t *stream) yuy2_frame->pts = frame->pts; yuy2_frame->duration = frame->duration; - extra_info_merge(yuy2_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yuy2_frame->extra_info, frame->extra_info); /* the logic for deciding upsampling to use comes from: * http://www.hometheaterhifi.com/volume_8_2/dvd-benchmark-special-report-chroma-bug-4-2001.html @@ -753,7 +753,7 @@ static int deinterlace_draw(vo_frame_t *frame, xine_stream_t *stream) frame->flags | VO_BOTH_FIELDS); pthread_mutex_lock (&this->lock); - extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info); + _x_extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info); if( this->tvtime->curmethod->doscalerbob ) { if( yuy2_frame->format == XINE_IMGFMT_YUY2 ) { @@ -857,7 +857,7 @@ static int deinterlace_draw(vo_frame_t *frame, xine_stream_t *stream) frame->flags | VO_BOTH_FIELDS); pthread_mutex_lock (&this->lock); - extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info); + _x_extra_info_merge(deinterlaced_frame->extra_info, frame->extra_info); if( skip > 0 && !this->pulldown ) { deinterlaced_frame->bad_frame = 1; diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c index f2ba0ddd9..184f7665f 100644 --- a/src/post/goom/xine_goom.c +++ b/src/post/goom/xine_goom.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_goom.c,v 1.39 2003/11/10 21:58:31 f1rmb Exp $ + * $Id: xine_goom.c,v 1.40 2003/11/11 18:44:58 f1rmb Exp $ * * GOOM post plugin. * @@ -295,7 +295,7 @@ static post_plugin_t *goom_open_plugin(post_class_t *class_gen, int inputs, this->buf.mem = NULL; this->buf.mem_size = 0; - port = post_intercept_audio_port(&this->post, audio_target[0]); + port = _x_post_intercept_audio_port(&this->post, audio_target[0]); port->port.open = goom_port_open; port->port.close = goom_port_close; port->port.put_buffer = goom_port_put_buffer; diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c index b3d741663..4118670c7 100644 --- a/src/post/mosaico/mosaico.c +++ b/src/post/mosaico/mosaico.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: mosaico.c,v 1.16 2003/10/23 20:12:34 mroi Exp $ + * $Id: mosaico.c,v 1.17 2003/11/11 18:44:59 f1rmb Exp $ */ /* @@ -213,7 +213,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, output->vo_port = video_target[0]; /* background */ - port = post_intercept_video_port(this, video_target[0]); + port = _x_post_intercept_video_port(this, video_target[0]); port->port.open = mosaico_open; port->port.get_frame = mosaico_get_frame; port->port.close = mosaico_close; @@ -258,7 +258,7 @@ static post_plugin_t *mosaico_open_plugin(post_class_t *class_gen, int inputs, if(xine_config_lookup_entry(class->xine, string, &h_entry)) h_changed_cb(class, &h_entry); - port2 = post_intercept_video_port(this, video_target[i]); + port2 = _x_post_intercept_video_port(this, video_target[i]); /* replace with our own get_frame function */ port2->port.open = mosaico_open; @@ -352,7 +352,7 @@ static vo_frame_t *mosaico_get_frame(xine_video_port_t *port_gen, uint32_t width frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = mosaico_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -371,7 +371,7 @@ static vo_frame_t *mosaico_get_frame_2(xine_video_port_t *port_gen, uint32_t wid frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = mosaico_draw_2; /* decoders should not copy the frames, since they won't be displayed */ @@ -554,7 +554,7 @@ static int _mosaico_draw_2(vo_frame_t *frame, post_mosaico_out_t *output, int co default: printf("Mosaico: cannot handle image format %d\n", frame->format); /*new_frame->free(new_frame); - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); return frame->draw(frame, stream);*/ } } @@ -580,7 +580,7 @@ static int mosaico_draw(vo_frame_t *frame, xine_stream_t *stream) /* new_frame->free(new_frame);*/ frame->vpts = output->saved_frame->vpts; pthread_mutex_unlock(&output->mut1); - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); return skip; } @@ -617,7 +617,7 @@ static int mosaico_draw_2(vo_frame_t *frame, xine_stream_t *stream) _mosaico_draw_2(frame, output, i-1); - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); return 0; } diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c index d85cd90e0..86dd7dece 100644 --- a/src/post/mosaico/switch.c +++ b/src/post/mosaico/switch.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: switch.c,v 1.8 2003/10/23 20:12:34 mroi Exp $ + * $Id: switch.c,v 1.9 2003/11/11 18:44:59 f1rmb Exp $ */ /* @@ -168,7 +168,7 @@ static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs, /* first input */ input2 = (xine_post_in_t *)malloc(sizeof(xine_post_in_t)); - port = post_intercept_video_port(this, video_target[0]); + port = _x_post_intercept_video_port(this, video_target[0]); /* replace with our own get_frame function */ port->port.open = switch_open; port->port.get_frame = switch_get_frame; @@ -185,7 +185,7 @@ static post_plugin_t *switch_open_plugin(post_class_t *class_gen, int inputs, /* second input */ input2 = (xine_post_in_t *)malloc(sizeof(xine_post_in_t)); - port = post_intercept_video_port(this, video_target[1]); + port = _x_post_intercept_video_port(this, video_target[1]); /* replace with our own get_frame function */ port->port.open = switch_open; port->port.get_frame = switch_get_frame_2; @@ -293,7 +293,7 @@ static vo_frame_t *switch_get_frame(xine_video_port_t *port_gen, uint32_t width, frame = port->original_port->get_frame(port->original_port, width, height , ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = switch_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -317,7 +317,7 @@ static vo_frame_t *switch_get_frame_2(xine_video_port_t *port_gen, uint32_t widt frame = port->original_port->get_frame(port->original_port, width, height , ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = switch_draw_2; /* decoders should not copy the frames, since they won't be displayed */ @@ -386,7 +386,7 @@ static int switch_draw_2(vo_frame_t *frame, xine_stream_t *stream) if(!output->selected_source) { /* printf("draw_2 quitting\n"); */ - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); pthread_mutex_unlock(&output->mut1); return 0; } @@ -397,7 +397,7 @@ static int switch_draw_2(vo_frame_t *frame, xine_stream_t *stream) res_frame->pts = frame->pts; res_frame->duration = frame->duration; res_frame->bad_frame = frame->bad_frame; - extra_info_merge(res_frame->extra_info, frame->extra_info); + _x_extra_info_merge(res_frame->extra_info, frame->extra_info); frame_copy_content(res_frame, frame); @@ -407,7 +407,7 @@ static int switch_draw_2(vo_frame_t *frame, xine_stream_t *stream) res_frame->free(res_frame); frame->vpts = res_frame->vpts; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); pthread_mutex_unlock(&output->mut1); @@ -425,7 +425,7 @@ static int switch_draw(vo_frame_t *frame, xine_stream_t *stream) if(output->selected_source) { /* printf("draw_1 quitting\n"); */ - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); pthread_mutex_unlock(&output->mut1); return 0; } @@ -436,7 +436,7 @@ static int switch_draw(vo_frame_t *frame, xine_stream_t *stream) res_frame->pts = frame->pts; res_frame->duration = frame->duration; res_frame->bad_frame = frame->bad_frame; - extra_info_merge(res_frame->extra_info, frame->extra_info); + _x_extra_info_merge(res_frame->extra_info, frame->extra_info); frame_copy_content(res_frame, frame); @@ -446,7 +446,7 @@ static int switch_draw(vo_frame_t *frame, xine_stream_t *stream) res_frame->free(res_frame); frame->vpts = res_frame->vpts; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); pthread_mutex_unlock(&output->mut1); diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c index 5f0764239..5b94c1230 100644 --- a/src/post/planar/boxblur.c +++ b/src/post/planar/boxblur.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: boxblur.c,v 1.9 2003/11/01 18:34:22 miguelfreitas Exp $ + * $Id: boxblur.c,v 1.10 2003/11/11 18:44:59 f1rmb Exp $ * * mplayer's boxblur * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at> @@ -194,7 +194,7 @@ static post_plugin_t *boxblur_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = boxblur_open; port->port.get_frame = boxblur_get_frame; @@ -306,7 +306,7 @@ static vo_frame_t *boxblur_get_frame(xine_video_port_t *port_gen, uint32_t width frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = boxblur_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -411,7 +411,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream) int cw, ch; int skip; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame ) { @@ -424,7 +424,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream) yv12_frame->pts = frame->pts; yv12_frame->duration = frame->duration; - extra_info_merge(yv12_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info); yuy2_to_yv12(frame->base[0], frame->pitches[0], yv12_frame->base[0], yv12_frame->pitches[0], @@ -442,7 +442,7 @@ static int boxblur_draw(vo_frame_t *frame, xine_stream_t *stream) frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c index dc5441486..fe76e2a6c 100644 --- a/src/post/planar/denoise3d.c +++ b/src/post/planar/denoise3d.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: denoise3d.c,v 1.9 2003/11/01 18:34:22 miguelfreitas Exp $ + * $Id: denoise3d.c,v 1.10 2003/11/11 18:44:59 f1rmb Exp $ * * mplayer's denoise3d * Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org> @@ -231,7 +231,7 @@ static post_plugin_t *denoise3d_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = denoise3d_open; port->port.get_frame = denoise3d_get_frame; @@ -345,7 +345,7 @@ static vo_frame_t *denoise3d_get_frame(xine_video_port_t *port_gen, uint32_t wid frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = denoise3d_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -425,7 +425,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream) int cw, ch; int skip; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame ) { @@ -438,7 +438,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream) yv12_frame->pts = frame->pts; yv12_frame->duration = frame->duration; - extra_info_merge(yv12_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info); yuy2_to_yv12(frame->base[0], frame->pitches[0], yv12_frame->base[0], yv12_frame->pitches[0], @@ -456,7 +456,7 @@ static int denoise3d_draw(vo_frame_t *frame, xine_stream_t *stream) frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c index be8deb704..2077e2a26 100644 --- a/src/post/planar/eq.c +++ b/src/post/planar/eq.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: eq.c,v 1.8 2003/11/01 18:34:22 miguelfreitas Exp $ + * $Id: eq.c,v 1.9 2003/11/11 18:44:59 f1rmb Exp $ * * mplayer's eq (soft video equalizer) * Copyright (C) Richard Felker @@ -288,7 +288,7 @@ static post_plugin_t *eq_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = eq_open; port->port.get_frame = eq_get_frame; @@ -430,7 +430,7 @@ static vo_frame_t *eq_get_frame(xine_video_port_t *port_gen, uint32_t width, frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = eq_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -461,7 +461,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream) vo_frame_t *yv12_frame; int skip; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame && ((this->params.brightness != 0) || (this->params.contrast != 0)) ) { @@ -474,7 +474,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream) yv12_frame->pts = frame->pts; yv12_frame->duration = frame->duration; - extra_info_merge(yv12_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info); yuy2_to_yv12(frame->base[0], frame->pitches[0], yv12_frame->base[0], yv12_frame->pitches[0], @@ -492,7 +492,7 @@ static int eq_draw(vo_frame_t *frame, xine_stream_t *stream) frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c index ee765f382..0cea3276e 100644 --- a/src/post/planar/eq2.c +++ b/src/post/planar/eq2.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: eq2.c,v 1.10 2003/11/01 18:34:22 miguelfreitas Exp $ + * $Id: eq2.c,v 1.11 2003/11/11 18:44:59 f1rmb Exp $ * * mplayer's eq2 (soft video equalizer) * Software equalizer (brightness, contrast, gamma, saturation) @@ -482,7 +482,7 @@ static post_plugin_t *eq2_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = eq2_open; port->port.get_frame = eq2_get_frame; @@ -632,7 +632,7 @@ static vo_frame_t *eq2_get_frame(xine_video_port_t *port_gen, uint32_t width, frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = eq2_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -665,7 +665,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream) int skip; int i; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame && (eq2->param[0].adjust || eq2->param[1].adjust || eq2->param[2].adjust) ) { @@ -678,7 +678,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream) yv12_frame->pts = frame->pts; yv12_frame->duration = frame->duration; - extra_info_merge(yv12_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info); yuy2_to_yv12(frame->base[0], frame->pitches[0], yv12_frame->base[0], yv12_frame->pitches[0], @@ -695,7 +695,7 @@ static int eq2_draw(vo_frame_t *frame, xine_stream_t *stream) frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c index db9436e51..9f3cda2cf 100644 --- a/src/post/planar/expand.c +++ b/src/post/planar/expand.c @@ -183,7 +183,7 @@ static post_plugin_t *expand_open_plugin(post_class_t *class_gen, int inputs, this->frames_prealloc = NULL; this->num_frames = 0; - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = expand_open; port->port.get_frame = expand_get_frame; @@ -437,7 +437,7 @@ static video_overlay_manager_t *expand_get_overlay_manager(xine_video_port_t *po if (!this->overlay_manager) { /* create a new overlay manager to intercept */ - this->overlay_manager = post_intercept_overlay_manager(&this->post, + this->overlay_manager = _x_post_intercept_overlay_manager(&this->post, port->original_port->get_overlay_manager(port->original_port)); /* replace with our own add_event function */ this->overlay_manager->manager.add_event = expand_overlay_add_event; @@ -467,7 +467,7 @@ static int expand_draw(vo_frame_t *frame, xine_stream_t *stream) original_frame->pts = frame->pts; original_frame->duration = frame->duration; original_frame->bad_frame = frame->bad_frame; - extra_info_merge(original_frame->extra_info, frame->extra_info); + _x_extra_info_merge(original_frame->extra_info, frame->extra_info); skip = original_frame->draw(original_frame, stream); frame->vpts = original_frame->vpts; return skip; diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c index db8851260..ba0db55c4 100644 --- a/src/post/planar/invert.c +++ b/src/post/planar/invert.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: invert.c,v 1.14 2003/10/22 20:38:10 komadori Exp $ + * $Id: invert.c,v 1.15 2003/11/11 18:44:59 f1rmb Exp $ */ /* @@ -96,7 +96,7 @@ static post_plugin_t *invert_open_plugin(post_class_t *class_gen, int inputs, return NULL; } - port = post_intercept_video_port(this, video_target[0]); + port = _x_post_intercept_video_port(this, video_target[0]); /* replace with our own get_frame function */ port->port.open = invert_open; port->port.get_frame = invert_get_frame; @@ -199,7 +199,7 @@ static vo_frame_t *invert_get_frame(xine_video_port_t *port_gen, uint32_t width, frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = invert_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -228,7 +228,7 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream) inverted_frame->pts = frame->pts; inverted_frame->duration = frame->duration; inverted_frame->bad_frame = frame->bad_frame; - extra_info_merge(inverted_frame->extra_info, frame->extra_info); + _x_extra_info_merge(inverted_frame->extra_info, frame->extra_info); switch (inverted_frame->format) { case XINE_IMGFMT_YUY2: @@ -253,13 +253,13 @@ static int invert_draw(vo_frame_t *frame, xine_stream_t *stream) default: printf("invert: cannot handle image format %d\n", frame->format); inverted_frame->free(inverted_frame); - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); return frame->draw(frame, stream); } skip = inverted_frame->draw(inverted_frame, stream); inverted_frame->free(inverted_frame); frame->vpts = inverted_frame->vpts; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); return skip; } diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index 13ee9e02e..fe847211e 100755 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.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: pp.c,v 1.1 2003/11/07 18:37:34 miguelfreitas Exp $ + * $Id: pp.c,v 1.2 2003/11/11 18:44:59 f1rmb Exp $ * * plugin for ffmpeg libpostprocess */ @@ -228,7 +228,7 @@ static post_plugin_t *pp_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = pp_open; port->port.get_frame = pp_get_frame; @@ -351,7 +351,7 @@ static vo_frame_t *pp_get_frame(xine_video_port_t *port_gen, uint32_t width, width, height, ratio, format, flags); if( format == XINE_IMGFMT_YV12 || format == XINE_IMGFMT_YUY2 ) { - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = pp_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -381,14 +381,14 @@ static int pp_draw(vo_frame_t *frame, xine_stream_t *stream) int skip; int pp_flags; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame ) { out_frame = port->original_port->get_frame(port->original_port, frame->width, frame->height, frame->ratio, frame->format, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c index 30784fa2b..65ebba954 100644 --- a/src/post/planar/unsharp.c +++ b/src/post/planar/unsharp.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: unsharp.c,v 1.10 2003/11/02 12:57:27 miguelfreitas Exp $ + * $Id: unsharp.c,v 1.11 2003/11/11 18:44:59 f1rmb Exp $ * * mplayer's unsharp * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com> @@ -329,7 +329,7 @@ static post_plugin_t *unsharp_open_plugin(post_class_t *class_gen, int inputs, pthread_mutex_init (&this->lock, NULL); - port = post_intercept_video_port(&this->post, video_target[0]); + port = _x_post_intercept_video_port(&this->post, video_target[0]); /* replace with our own get_frame function */ port->port.open = unsharp_open; port->port.get_frame = unsharp_get_frame; @@ -464,7 +464,7 @@ static vo_frame_t *unsharp_get_frame(xine_video_port_t *port_gen, uint32_t width frame = port->original_port->get_frame(port->original_port, width, height, ratio, format, flags); - post_intercept_video_frame(frame, port); + _x_post_intercept_video_frame(frame, port); /* replace with our own draw function */ frame->draw = unsharp_draw; /* decoders should not copy the frames, since they won't be displayed */ @@ -494,7 +494,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream) vo_frame_t *yv12_frame; int skip; - post_restore_video_frame(frame, port); + _x_post_restore_video_frame(frame, port); if( !frame->bad_frame && (this->priv.lumaParam.amount || this->priv.chromaParam.amount) ) { @@ -508,7 +508,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream) yv12_frame->pts = frame->pts; yv12_frame->duration = frame->duration; - extra_info_merge(yv12_frame->extra_info, frame->extra_info); + _x_extra_info_merge(yv12_frame->extra_info, frame->extra_info); yuy2_to_yv12(frame->base[0], frame->pitches[0], yv12_frame->base[0], yv12_frame->pitches[0], @@ -526,7 +526,7 @@ static int unsharp_draw(vo_frame_t *frame, xine_stream_t *stream) frame->width, frame->height, frame->ratio, XINE_IMGFMT_YV12, frame->flags | VO_BOTH_FIELDS); - extra_info_merge(out_frame->extra_info, frame->extra_info); + _x_extra_info_merge(out_frame->extra_info, frame->extra_info); out_frame->pts = frame->pts; out_frame->duration = frame->duration; diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c index 22179cec1..3d3089642 100644 --- a/src/post/visualizations/fftgraph.c +++ b/src/post/visualizations/fftgraph.c @@ -20,7 +20,7 @@ * FftGraph Visualization Post Plugin For xine * by Thibaut Mattern (tmattern@noos.fr) * - * $Id: fftgraph.c,v 1.3 2003/10/30 22:40:53 mroi Exp $ + * $Id: fftgraph.c,v 1.4 2003/11/11 18:44:59 f1rmb Exp $ * */ @@ -464,7 +464,7 @@ static post_plugin_t *fftgraph_open_plugin(post_class_t *class_gen, int inputs, this->buf.mem = NULL; this->buf.mem_size = 0; - port = post_intercept_audio_port(&this->post, audio_target[0]); + port = _x_post_intercept_audio_port(&this->post, audio_target[0]); port->port.open = fftgraph_port_open; port->port.close = fftgraph_port_close; port->port.put_buffer = fftgraph_port_put_buffer; diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c index 4cdc8b93c..6277be7c9 100644 --- a/src/post/visualizations/fftscope.c +++ b/src/post/visualizations/fftscope.c @@ -22,7 +22,7 @@ * * FFT code by Steve Haehnichen, originally licensed under GPL v1 * - * $Id: fftscope.c,v 1.17 2003/10/30 22:40:53 mroi Exp $ + * $Id: fftscope.c,v 1.18 2003/11/11 18:44:59 f1rmb Exp $ * */ @@ -503,7 +503,7 @@ static post_plugin_t *fftscope_open_plugin(post_class_t *class_gen, int inputs, this->buf.mem = NULL; this->buf.mem_size = 0; - port = post_intercept_audio_port(&this->post, audio_target[0]); + port = _x_post_intercept_audio_port(&this->post, audio_target[0]); port->port.open = fftscope_port_open; port->port.close = fftscope_port_close; port->port.put_buffer = fftscope_port_put_buffer; diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c index 4b302f2df..4f70de432 100644 --- a/src/post/visualizations/fooviz.c +++ b/src/post/visualizations/fooviz.c @@ -23,7 +23,7 @@ * process. It simply paints the screen a solid color and rotates through * colors on each iteration. * - * $Id: fooviz.c,v 1.12 2003/10/30 22:40:53 mroi Exp $ + * $Id: fooviz.c,v 1.13 2003/11/11 18:45:00 f1rmb Exp $ * */ @@ -300,7 +300,7 @@ static post_plugin_t *fooviz_open_plugin(post_class_t *class_gen, int inputs, this->buf.mem = NULL; this->buf.mem_size = 0; - port = post_intercept_audio_port(&this->post, audio_target[0]); + port = _x_post_intercept_audio_port(&this->post, audio_target[0]); port->port.open = fooviz_port_open; port->port.close = fooviz_port_close; port->port.put_buffer = fooviz_port_put_buffer; diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c index 4f312ca49..71fe3933a 100644 --- a/src/post/visualizations/oscope.c +++ b/src/post/visualizations/oscope.c @@ -20,7 +20,7 @@ * Basic Oscilloscope Visualization Post Plugin For xine * by Mike Melanson (melanson@pcisys.net) * - * $Id: oscope.c,v 1.10 2003/10/30 22:40:53 mroi Exp $ + * $Id: oscope.c,v 1.11 2003/11/11 18:45:00 f1rmb Exp $ * */ @@ -370,7 +370,7 @@ static post_plugin_t *oscope_open_plugin(post_class_t *class_gen, int inputs, this->buf.mem = NULL; this->buf.mem_size = 0; - port = post_intercept_audio_port(&this->post, audio_target[0]); + port = _x_post_intercept_audio_port(&this->post, audio_target[0]); port->port.open = oscope_port_open; port->port.close = oscope_port_close; port->port.put_buffer = oscope_port_put_buffer; diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c index 8016e3a08..4852b3e00 100755 --- a/src/video_out/video_out_directx.c +++ b/src/video_out/video_out_directx.c @@ -20,7 +20,7 @@ * video_out_directx.c, direct draw video output plugin for xine * by Matthew Grooms <elon@altavista.com> * - * $Id: video_out_directx.c,v 1.9 2003/10/31 17:25:20 mroi Exp $ + * $Id: video_out_directx.c,v 1.10 2003/11/11 18:45:00 f1rmb Exp $ */ typedef unsigned char boolean; @@ -1144,7 +1144,7 @@ static int win32_redraw_needed(vo_driver_t* this_gen) /* TC - May need to revisit this! */ #ifdef TC - if( vo_scale_redraw_needed( &win32_driver->sc ) ) { + if( _x_vo_scale_redraw_needed( &win32_driver->sc ) ) { win32_gui_data_exchange(this_gen, GUI_WIN32_MOVED_OR_RESIZED, 0); ret = 1; } diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 5157a0c02..0d7c8ff73 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.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_fb.c,v 1.30 2003/10/23 15:17:07 mroi Exp $ + * $Id: video_out_fb.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -254,12 +254,12 @@ static vo_frame_t *fb_alloc_frame(vo_driver_t *this_gen) static void fb_compute_ideal_size(fb_driver_t *this, fb_frame_t *frame) { - vo_scale_compute_ideal_size(&frame->sc); + _x_vo_scale_compute_ideal_size(&frame->sc); } static void fb_compute_rgb_size(fb_driver_t *this, fb_frame_t *frame) { - vo_scale_compute_output_size(&frame->sc); + _x_vo_scale_compute_output_size(&frame->sc); /* avoid problems in yuv2rgb */ if(frame->sc.output_height < (frame->sc.delivered_height+15) >> 4) @@ -574,7 +574,7 @@ static void fb_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen) if (this->sc.frame_output_cb) { this->sc.delivered_height = frame->sc.delivered_height; this->sc.delivered_width = frame->sc.delivered_width; - vo_scale_redraw_needed( &this->sc ); + _x_vo_scale_redraw_needed( &this->sc ); } if(this->use_zero_copy) @@ -638,7 +638,7 @@ static int fb_set_property(vo_driver_t *this_gen, int property, int value) value = XINE_VO_ASPECT_AUTO; this->sc.user_ratio = value; printf("video_out_fb: aspect ratio changed to %s\n", - vo_scale_aspect_ratio_name(value)); + _x_vo_scale_aspect_ratio_name(value)); break; case VO_PROP_BRIGHTNESS: @@ -963,7 +963,7 @@ static vo_driver_t *fb_open_plugin(video_driver_class_t *class_gen, (this->fb_var.xres_virtual * this->fb_var.bits_per_pixel)/8; - vo_scale_init(&this->sc, 0, 0, config); + _x_vo_scale_init(&this->sc, 0, 0, config); this->sc.gui_width = this->fb_var.xres; this->sc.gui_height = this->fb_var.yres; this->sc.user_ratio = XINE_VO_ASPECT_AUTO; diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 5822ec342..42f4cc9e0 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.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_opengl.c,v 1.30 2003/10/23 15:17:07 mroi Exp $ + * $Id: video_out_opengl.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_glut.c, glut based OpenGL rendering interface for xine * Matthias Hopf <mat@mshopf.de> @@ -302,7 +302,7 @@ static vo_frame_t *opengl_alloc_frame (vo_driver_t *this_gen) { static void opengl_compute_ideal_size (opengl_driver_t *this) { - vo_scale_compute_ideal_size (&this->sc); + _x_vo_scale_compute_ideal_size (&this->sc); } @@ -395,7 +395,7 @@ static void opengl_compute_output_size (opengl_driver_t *this) { int old_x = this->sc.output_xoffset; int old_y = this->sc.output_yoffset; - vo_scale_compute_output_size (&this->sc); + _x_vo_scale_compute_output_size (&this->sc); /* avoid problems in yuv2rgb */ if (this->sc.output_height < ((this->sc.delivered_height + 15) >> 4)) @@ -476,7 +476,7 @@ static int opengl_redraw_needed (vo_driver_t *this_gen) { DEBUGF ((stderr, "*** redraw_needed %dx%d\n", this->sc.delivered_width, this->sc.delivered_height)); - if (vo_scale_redraw_needed (&this->sc)) { + if (_x_vo_scale_redraw_needed (&this->sc)) { opengl_compute_output_size (this); /* Actually, the output area is cleared in render_image */ return 1; @@ -770,7 +770,7 @@ static int opengl_set_property (vo_driver_t *this_gen, value = XINE_VO_ASPECT_AUTO; this->sc.user_ratio = value; fprintf (stderr, "video_out_opengl: aspect ratio changed to %s\n", - vo_scale_aspect_ratio_name (value)); + _x_vo_scale_aspect_ratio_name (value)); opengl_compute_ideal_size (this); // opengl_redraw_needed ((vo_driver_t *) this); break; @@ -865,9 +865,9 @@ static int opengl_gui_data_exchange (vo_driver_t *this_gen, int x1, y1, x2, y2; /* DEBUGF ((stderr, "*** gui_translate_gui_to_video ***\n")); */ - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; @@ -921,7 +921,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen, this->display = visual->display; this->screen = visual->screen; - vo_scale_init (&this->sc, 0, 0, class->config); + _x_vo_scale_init (&this->sc, 0, 0, class->config); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.dest_size_cb = visual->dest_size_cb; diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c index 6b49b4ad4..6c4edaa35 100644 --- a/src/video_out/video_out_pgx64.c +++ b/src/video_out/video_out_pgx64.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_pgx64.c,v 1.44 2003/11/01 15:47:34 komadori Exp $ + * $Id: video_out_pgx64.c,v 1.45 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine * @@ -414,7 +414,7 @@ static void pgx64_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen) this->delivered_format = frame->format; this->vo_scale.force_redraw = 1; - vo_scale_compute_ideal_size(&this->vo_scale); + _x_vo_scale_compute_ideal_size(&this->vo_scale); vram_reset(this); if (this->multibuf_en) { @@ -425,8 +425,8 @@ static void pgx64_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen) } } - if (vo_scale_redraw_needed(&this->vo_scale)) { - vo_scale_compute_output_size(&this->vo_scale); + if (_x_vo_scale_redraw_needed(&this->vo_scale)) { + _x_vo_scale_compute_output_size(&this->vo_scale); repaint_output_area(this); this->ovl_regen_needed = 1; @@ -805,7 +805,7 @@ static int pgx64_set_property(vo_driver_t *this_gen, int property, int value) } this->vo_scale.user_ratio = value; this->vo_scale.force_redraw = 1; - vo_scale_compute_ideal_size(&this->vo_scale); + _x_vo_scale_compute_ideal_size(&this->vo_scale); } break; @@ -882,8 +882,8 @@ static int pgx64_gui_data_exchange(vo_driver_t *this_gen, int data_type, void *d x11_rectangle_t *rect = data; int x1, y1, x2, y2; - vo_scale_translate_gui2video(&this->vo_scale, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->vo_scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2); + _x_vo_scale_translate_gui2video(&this->vo_scale, rect->x, rect->y, &x1, &y1); + _x_vo_scale_translate_gui2video(&this->vo_scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1; @@ -900,7 +900,7 @@ static int pgx64_redraw_needed(vo_driver_t *this_gen) { pgx64_driver_t *this = (pgx64_driver_t *)(void *)this_gen; - if (vo_scale_redraw_needed(&this->vo_scale)) { + if (_x_vo_scale_redraw_needed(&this->vo_scale)) { this->vo_scale.force_redraw = 1; this->ovl_regen_needed = 1; return 1; @@ -1063,7 +1063,7 @@ static vo_driver_t* pgx64_init_driver(video_driver_class_t *class_gen, const voi this->vo_driver.redraw_needed = pgx64_redraw_needed; this->vo_driver.dispose = pgx64_dispose; - vo_scale_init(&this->vo_scale, 0, 0, class->config); + _x_vo_scale_init(&this->vo_scale, 0, 0, class->config); this->vo_scale.user_ratio = XINE_VO_ASPECT_AUTO; this->vo_scale.user_data = ((x11_visual_t*)visual_gen)->user_data; this->vo_scale.frame_output_cb = ((x11_visual_t*)visual_gen)->frame_output_cb; diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c index df67ff08d..3711855d4 100644 --- a/src/video_out/video_out_sdl.c +++ b/src/video_out/video_out_sdl.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_sdl.c,v 1.30 2003/10/31 17:25:20 mroi Exp $ + * $Id: video_out_sdl.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_sdl.c, Simple DirectMedia Layer * @@ -157,12 +157,12 @@ static vo_frame_t *sdl_alloc_frame (vo_driver_t *this_gen) { static void sdl_compute_ideal_size (sdl_driver_t *this) { - vo_scale_compute_ideal_size( &this->sc ); + _x_vo_scale_compute_ideal_size( &this->sc ); } static void sdl_compute_output_size (sdl_driver_t *this) { - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); #ifdef LOG printf ("video_out_sdl: frame source %d x %d => screen output %d x %d\n", @@ -278,7 +278,7 @@ static int sdl_redraw_needed (vo_driver_t *this_gen) { #ifdef HAVE_X11 - if( vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { sdl_compute_output_size (this); @@ -372,7 +372,7 @@ static int sdl_set_property (vo_driver_t *this_gen, value = XINE_VO_ASPECT_AUTO; this->sc.user_ratio = value; printf("video_out_sdl: aspect ratio changed to %s\n", - vo_scale_aspect_ratio_name(value)); + _x_vo_scale_aspect_ratio_name(value)); sdl_compute_ideal_size (this); this->sc.force_redraw = 1; @@ -419,9 +419,9 @@ static int sdl_gui_data_exchange (vo_driver_t *this_gen, int x1, y1, x2, y2; x11_rectangle_t *rect = data; - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1; @@ -484,7 +484,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->screen = visual->screen; this->drawable = visual->d; - vo_scale_init( &this->sc, 0, 0, config); + _x_vo_scale_init( &this->sc, 0, 0, config); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.user_data = visual->user_data; @@ -492,7 +492,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi sprintf(SDL_windowhack,"SDL_WINDOWID=0x%x", (uint32_t) this->drawable ); putenv(SDL_windowhack); #else - vo_scale_init( &this->sc, 0, 0, config ); + _x_vo_scale_init( &this->sc, 0, 0, config ); #endif diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index a24c087ef..3d215294b 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.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_stk.c,v 1.8 2003/10/31 17:25:20 mroi Exp $ + * $Id: video_out_stk.c,v 1.9 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_stk.c, Libstk Surface Video Driver * more info on Libstk at http://www.libstk.org @@ -149,12 +149,12 @@ static vo_frame_t *stk_alloc_frame(vo_driver_t *this_gen) { static void stk_compute_ideal_size (stk_driver_t* this) { //printf("video_out_stk: compute_ideal_size()\n"); - vo_scale_compute_ideal_size(&this->sc); + _x_vo_scale_compute_ideal_size(&this->sc); } static void stk_compute_output_size (stk_driver_t *this) { //printf("video_out_stk: compute_output_size()\n"); - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); #ifdef LOG printf ("video_out_stk: frame source %d x %d => screen output %d x %d\n", @@ -328,7 +328,7 @@ static int stk_set_property (vo_driver_t* this_gen, int property, int value) { if (value>=XINE_VO_ASPECT_NUM_RATIOS) value = XINE_VO_ASPECT_AUTO; this->sc.user_ratio = value; - printf("video_out_stk: aspect ratio changed to %s\n", vo_scale_aspect_ratio_name(value)); + printf("video_out_stk: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name(value)); stk_compute_ideal_size (this); this->sc.force_redraw = 1; @@ -405,7 +405,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis /* this->capabilities = stk_surface_formats(this->surface); */ this->capabilities = VO_CAP_YUY2 | VO_CAP_YV12; /* FIXME: what does this do ? */ - vo_scale_init( &this->sc, 0, 0, this->config ); + _x_vo_scale_init( &this->sc, 0, 0, this->config ); this->sc.gui_x = stk_xine_panel_x(this->xine_panel); this->sc.gui_y = stk_xine_panel_y(this->xine_panel); this->sc.gui_width = stk_xine_panel_width(this->xine_panel); diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c index 05b2f2311..ea301fd99 100644 --- a/src/video_out/video_out_syncfb.c +++ b/src/video_out/video_out_syncfb.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_syncfb.c,v 1.91 2003/10/23 15:17:07 mroi Exp $ + * $Id: video_out_syncfb.c,v 1.92 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine * @@ -350,13 +350,13 @@ static void syncfb_clean_output_area(syncfb_driver_t* this) static void syncfb_compute_ideal_size (syncfb_driver_t *this) { - vo_scale_compute_ideal_size( &this->sc ); + _x_vo_scale_compute_ideal_size( &this->sc ); } /* make ideal width/height "fit" into the gui */ static void syncfb_compute_output_size(syncfb_driver_t *this) { - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); #ifdef DEBUG_OUTPUT printf("video_out_syncfb: debug. (frame source %d x %d, screen output %d x %d)\n", @@ -434,7 +434,7 @@ static int syncfb_redraw_needed(vo_driver_t* this_gen) int ret = 0; - if( vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { syncfb_compute_output_size (this); @@ -782,9 +782,9 @@ static int syncfb_gui_data_exchange(vo_driver_t* this_gen, int data_type, int x1, y1, x2, y2; x11_rectangle_t *rect = data; - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1; @@ -963,7 +963,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->drawable = visual->d; this->gc = XCreateGC (this->display, this->drawable, 0, NULL); - vo_scale_init (&this->sc, 1, 0, config ); + _x_vo_scale_init (&this->sc, 1, 0, config ); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.user_data = visual->user_data; diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c index 07de45ee1..c6d32fa45 100644 --- a/src/video_out/video_out_vidix.c +++ b/src/video_out/video_out_vidix.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_vidix.c,v 1.50 2003/10/31 17:25:20 mroi Exp $ + * $Id: video_out_vidix.c,v 1.51 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_vidix.c * @@ -414,7 +414,7 @@ static vo_frame_t *vidix_alloc_frame (vo_driver_t *this_gen) { static void vidix_compute_ideal_size (vidix_driver_t *this) { - vo_scale_compute_ideal_size( &this->sc ); + _x_vo_scale_compute_ideal_size( &this->sc ); } @@ -427,7 +427,7 @@ static void vidix_config_playback (vidix_driver_t *this) { uint32_t apitch; int err,i; - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); if( this->vidix_started > 0 ) { #ifdef LOG @@ -595,7 +595,7 @@ static int vidix_redraw_needed (vo_driver_t *this_gen) { vidix_driver_t *this = (vidix_driver_t *) this_gen; int ret = 0; - if(vo_scale_redraw_needed(&this->sc)) { + if(_x_vo_scale_redraw_needed(&this->sc)) { if(this->got_frame_data) { vidix_config_playback(this); vidix_clean_output_area(this); @@ -681,7 +681,7 @@ static int vidix_set_property (vo_driver_t *this_gen, if ( property == VO_PROP_ASPECT_RATIO) { #ifdef LOG printf("video_out_vidix: aspect ratio changed to %s\n", - vo_scale_aspect_ratio_name(value)); + _x_vo_scale_aspect_ratio_name(value)); #endif if(value == XINE_VO_ASPECT_NUM_RATIOS) @@ -844,9 +844,9 @@ static int vidix_gui_data_exchange (vo_driver_t *this_gen, int x1, y1, x2, y2; x11_rectangle_t *rect = data; - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1; @@ -892,7 +892,7 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) { this->vidix_handler = class->vidix_handler; this->vidix_cap = class->vidix_cap; - vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0, config ); + _x_vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0, config ); this->xine = class->xine; this->config = config; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 6984fcf87..51193a0ef 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.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_xshm.c,v 1.118 2003/10/24 22:34:50 f1rmb Exp $ + * $Id: video_out_xshm.c,v 1.119 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -401,11 +401,11 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) { } static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) { - vo_scale_compute_ideal_size( &frame->sc ); + _x_vo_scale_compute_ideal_size( &frame->sc ); } static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) { - vo_scale_compute_output_size( &frame->sc ); + _x_vo_scale_compute_output_size( &frame->sc ); /* avoid problems in yuv2rgb */ if (frame->sc.output_height < 1) @@ -656,7 +656,7 @@ static int xshm_redraw_needed (vo_driver_t *this_gen) { this->sc.delivered_height = this->cur_frame->sc.delivered_height; this->sc.delivered_width = this->cur_frame->sc.delivered_width; this->sc.video_pixel_aspect = this->cur_frame->sc.video_pixel_aspect; - if( vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { clean_output_area (this, this->cur_frame); ret = 1; @@ -684,7 +684,7 @@ static void xshm_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) { this->sc.delivered_height = frame->sc.delivered_height; this->sc.delivered_width = frame->sc.delivered_width; this->sc.video_pixel_aspect = frame->sc.video_pixel_aspect; - if( vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { clean_output_area (this, frame); } @@ -763,7 +763,7 @@ static int xshm_set_property (vo_driver_t *this_gen, this->sc.user_ratio = value; if (this->xine->verbosity >= XINE_VERBOSITY_LOG) { printf ("video_out_xshm: aspect ratio changed to %s\n", - vo_scale_aspect_ratio_name(value)); + _x_vo_scale_aspect_ratio_name(value)); } } else if (property == VO_PROP_BRIGHTNESS) { @@ -887,10 +887,10 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen, x11_rectangle_t *rect = data; int x1, y1, x2, y2; - vo_scale_translate_gui2video(&this->cur_frame->sc, + _x_vo_scale_translate_gui2video(&this->cur_frame->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->cur_frame->sc, + _x_vo_scale_translate_gui2video(&this->cur_frame->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; @@ -1003,7 +1003,7 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi this->display = visual->display; this->screen = visual->screen; - vo_scale_init( &this->sc, 0, 0, config ); + _x_vo_scale_init( &this->sc, 0, 0, config ); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.dest_size_cb = visual->dest_size_cb; this->sc.user_data = visual->user_data; diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c index 4ff74822b..5c35d77be 100644 --- a/src/video_out/video_out_xv.c +++ b/src/video_out/video_out_xv.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_xv.c,v 1.180 2003/10/31 17:25:20 mroi Exp $ + * $Id: video_out_xv.c,v 1.181 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_xv.c, X11 video extension interface for xine * @@ -586,7 +586,7 @@ static void xv_clean_output_area (xv_driver_t *this) { */ static void xv_compute_ideal_size (xv_driver_t *this) { - vo_scale_compute_ideal_size( &this->sc ); + _x_vo_scale_compute_ideal_size( &this->sc ); } @@ -596,7 +596,7 @@ static void xv_compute_ideal_size (xv_driver_t *this) { static void xv_compute_output_size (xv_driver_t *this) { - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); /* onefield_xv divide by 2 the number of lines */ if (this->deinterlace_enabled @@ -665,7 +665,7 @@ static int xv_redraw_needed (vo_driver_t *this_gen) { xv_compute_ideal_size(this); - if( vo_scale_redraw_needed( &this->sc ) ) { + if( _x_vo_scale_redraw_needed( &this->sc ) ) { xv_compute_output_size (this); @@ -936,9 +936,9 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen, int x1, y1, x2, y2; x11_rectangle_t *rect = data; - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; rect->y = y1; @@ -1148,7 +1148,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->xv_port = class->xv_port; this->config = config; - vo_scale_init (&this->sc, 1, 0, config ); + _x_vo_scale_init (&this->sc, 1, 0, config ); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.user_data = visual->user_data; diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c index 30e816fb4..91f90530d 100644 --- a/src/video_out/video_out_xvmc.c +++ b/src/video_out/video_out_xvmc.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_xvmc.c,v 1.6 2003/10/31 17:25:21 mroi Exp $ + * $Id: video_out_xvmc.c,v 1.7 2003/11/11 18:45:00 f1rmb Exp $ * * video_out_xvmc.c, X11 video motion compensation extension interface for xine * @@ -851,7 +851,7 @@ static void xvmc_clean_output_area (xvmc_driver_t *this) { */ static void xvmc_compute_ideal_size (xvmc_driver_t *this) { - vo_scale_compute_ideal_size( &this->sc ); + _x_vo_scale_compute_ideal_size( &this->sc ); } /* @@ -859,7 +859,7 @@ static void xvmc_compute_ideal_size (xvmc_driver_t *this) { */ static void xvmc_compute_output_size (xvmc_driver_t *this) { - vo_scale_compute_output_size( &this->sc ); + _x_vo_scale_compute_output_size( &this->sc ); } static void xvmc_overlay_blend (vo_driver_t *this_gen, @@ -926,7 +926,7 @@ static int xvmc_redraw_needed (vo_driver_t *this_gen) { xvmc_compute_ideal_size(this); - if(vo_scale_redraw_needed(&this->sc)) { + if(_x_vo_scale_redraw_needed(&this->sc)) { xvmc_compute_output_size (this); xvmc_clean_output_area (this); ret = 1; @@ -1202,9 +1202,9 @@ static int xvmc_gui_data_exchange (vo_driver_t *this_gen, &x2, &y2); */ - vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, + _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y, &x1, &y1); - vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, + _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h, &x2, &y2); rect->x = x1; @@ -1377,7 +1377,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi this->xv_port = class->xv_port; this->config = config; - vo_scale_init (&this->sc, 1, 0, config ); + _x_vo_scale_init (&this->sc, 1, 0, config ); this->sc.frame_output_cb = visual->frame_output_cb; this->sc.user_data = visual->user_data; 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 diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 0ce5ea9cb..cca80ad78 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -26,12 +26,12 @@ libxineutils_la_SOURCES = $(pppc_files) \ libxineutils_la_LIBADD = $(THREAD_LIBS) -include_HEADERS = attributes.h \ +include_HEADERS = \ + attributes.h \ compat.h \ + xine_buffer.h \ xineutils.h \ - xine_check.h \ xmllexer.h \ - xmlparser.h \ - xine_buffer.h + xmlparser.h -noinst_HEADERS = ppcasm_string.h +noinst_HEADERS = ppcasm_string.h xine_check.h diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c index 57e8a5f21..ccd3a6424 100644 --- a/src/xine-utils/xine_check.c +++ b/src/xine-utils/xine_check.c @@ -119,25 +119,25 @@ xine_health_check_t* xine_health_check (xine_health_check_t* hc, int check_num) switch(check_num) { case CHECK_KERNEL: - hc = xine_health_check_kernel (hc); + hc = _x_health_check_kernel (hc); break; case CHECK_MTRR: - hc = xine_health_check_mtrr (hc); + hc = _x_health_check_mtrr (hc); break; case CHECK_CDROM: - hc = xine_health_check_cdrom (hc); + hc = _x_health_check_cdrom (hc); break; case CHECK_DVDROM: - hc = xine_health_check_dvdrom (hc); + hc = _x_health_check_dvdrom (hc); break; case CHECK_DMA: - hc = xine_health_check_dma (hc); + hc = _x_health_check_dma (hc); break; case CHECK_X: - hc = xine_health_check_x (hc); + hc = _x_health_check_x (hc); break; case CHECK_XV: - hc = xine_health_check_xv (hc); + hc = _x_health_check_xv (hc); break; default: hc->status = XINE_HEALTH_CHECK_NO_SUCH_CHECK; @@ -146,7 +146,7 @@ xine_health_check_t* xine_health_check (xine_health_check_t* hc, int check_num) return hc; } -xine_health_check_t* xine_health_check_kernel (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_kernel (xine_health_check_t* hc) { struct utsname kernel; hc->title = "Check for kernel version"; @@ -166,7 +166,7 @@ xine_health_check_t* xine_health_check_kernel (xine_health_check_t* hc) { } #if defined(ARCH_X86) || defined(ARCH_X86_64) -xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_mtrr (xine_health_check_t* hc) { char *file = "/proc/mtrr"; FILE *fd; @@ -184,7 +184,7 @@ xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) { return hc; } #else -xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_mtrr (xine_health_check_t* hc) { hc->title = "Check for MTRR support"; hc->explanation = "Don't worry about this one"; @@ -195,7 +195,7 @@ xine_health_check_t* xine_health_check_mtrr (xine_health_check_t* hc) { } #endif -xine_health_check_t* xine_health_check_cdrom (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_cdrom (xine_health_check_t* hc) { struct stat cdrom_st; hc->title = "Check for CDROM drive"; @@ -226,7 +226,7 @@ xine_health_check_t* xine_health_check_cdrom (xine_health_check_t* hc) { return hc; } -xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_dvdrom(xine_health_check_t* hc) { struct stat dvdrom_st; @@ -258,7 +258,7 @@ xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t* hc) { return hc; } -xine_health_check_t* xine_health_check_dma (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_dma (xine_health_check_t* hc) { int is_scsi_dev = 0; int fd = 0; @@ -312,7 +312,7 @@ xine_health_check_t* xine_health_check_dma (xine_health_check_t* hc) { } -xine_health_check_t* xine_health_check_x (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_x (xine_health_check_t* hc) { char* env_display = getenv("DISPLAY"); hc->title = "Check for X11 environment"; @@ -328,7 +328,7 @@ xine_health_check_t* xine_health_check_x (xine_health_check_t* hc) { return hc; } -xine_health_check_t* xine_health_check_xv (xine_health_check_t* hc) { +xine_health_check_t* _x_health_check_xv (xine_health_check_t* hc) { #ifdef HAVE_X11 #ifdef HAVE_XV diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h index f61bbc75b..53778ce7e 100644 --- a/src/xine-utils/xine_check.h +++ b/src/xine-utils/xine_check.h @@ -14,28 +14,27 @@ * cdrom_dev = Name of the device link for the cdrom drive (e.g. /dev/cdrom) * dvd_dev = Name of the device link for the dvd drive (e.g. /dev/dvd) */ -xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num); +//xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num); /* Get Kernel information */ -xine_health_check_t* xine_health_check_kernel(xine_health_check_t*); +xine_health_check_t* _x_health_check_kernel(xine_health_check_t*); /* health_check MTRR */ -xine_health_check_t* xine_health_check_mtrr(xine_health_check_t*); +xine_health_check_t* _x_health_check_mtrr(xine_health_check_t*); /* health_check CDROM */ -xine_health_check_t* xine_health_check_cdrom(xine_health_check_t*); +xine_health_check_t* _x_health_check_cdrom(xine_health_check_t*); /* health_check DVDROM */ -xine_health_check_t* xine_health_check_dvdrom(xine_health_check_t*); +xine_health_check_t* _x_health_check_dvdrom(xine_health_check_t*); /* health_check DMA settings of DVD drive*/ -xine_health_check_t* xine_health_check_dma(xine_health_check_t*); +xine_health_check_t* _x_health_check_dma(xine_health_check_t*); /* health_check X */ -xine_health_check_t* xine_health_check_x(xine_health_check_t*); +xine_health_check_t* _x_health_check_x(xine_health_check_t*); /* health_check Xv extension */ -xine_health_check_t* xine_health_check_xv(xine_health_check_t*); +xine_health_check_t* _x_health_check_xv(xine_health_check_t*); #endif - diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h index 91e4e0d7a..3ccadba03 100644 --- a/src/xine-utils/xineutils.h +++ b/src/xine-utils/xineutils.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: xineutils.h,v 1.63 2003/11/04 14:38:26 valtri Exp $ + * $Id: xineutils.h,v 1.64 2003/11/11 18:45:02 f1rmb Exp $ * */ #ifndef XINEUTILS_H @@ -104,7 +104,6 @@ extern "C" { #define MM_SSE2 MM_ACCEL_X86_SSE2 uint32_t xine_mm_accel (void); -/* uint32_t xine_mm_support (void) ; */ #if defined(ARCH_X86) || defined(ARCH_X86_64) @@ -661,7 +660,7 @@ void xine_strdupa(char *dest, char *src); #ifdef HAVE_STRPBRK #define xine_strpbrk strpbrk #else -static inline char *_x_strpbrk(const char *s, const char *accept) { +static inline char *_private_strpbrk(const char *s, const char *accept) { while(*s != '\0') { const char *a = accept; @@ -673,13 +672,13 @@ static inline char *_x_strpbrk(const char *s, const char *accept) { return NULL; } -#define xine_strpbrk _x_strpbrk +#define xine_strpbrk _private_strpbrk #endif #if defined HAVE_STRSEP && !defined(_MSC_VER) #define xine_strsep strsep #else -static inline char *_x_strsep(char **stringp, const char *delim) { +static inline char *_private_strsep(char **stringp, const char *delim) { char *begin, *end; begin = *stringp; @@ -712,14 +711,14 @@ static inline char *_x_strsep(char **stringp, const char *delim) { return begin; } -#define xine_strsep _x_strsep +#define xine_strsep _private_strsep #endif #ifdef HAVE_SETENV #define xine_setenv setenv #else -static inline void _x_setenv(const char *name, const char *val, int _xx) +static inline void _private_setenv(const char *name, const char *val, int _xx) { int len = strlen(name) + strlen(val) + 2; char *env; @@ -733,7 +732,7 @@ static inline void _x_setenv(const char *name, const char *val, int _xx) putenv(env); } } -#define xine_setenv _x_setenv +#define xine_setenv _private_setenv #endif /* |