diff options
Diffstat (limited to 'src/demuxers')
40 files changed, 252 insertions, 252 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: |