diff options
Diffstat (limited to 'src/demuxers')
40 files changed, 307 insertions, 310 deletions
diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c index 740a43dde..9bd2941ca 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.10 2003/11/16 14:34:09 tmmm Exp $ + * $Id: demux_4xm.c,v 1.11 2003/11/16 23:33:42 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -380,19 +380,19 @@ static void demux_fourxm_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->track_count > 0) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); if (this->track_count > 0) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->tracks[0].channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->tracks[0].sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->tracks[0].bits); } diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c index 0142fac9d..992620d17 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.13 2003/11/15 14:00:38 miguelfreitas Exp $ + * $Id: demux_ac3.c,v 1.14 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -230,8 +230,8 @@ static void demux_ac3_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c index 24314f3fc..73af2fff6 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.36 2003/11/15 14:00:38 miguelfreitas Exp $ + * $Id: demux_aiff.c,v 1.37 2003/11/16 23:33:43 f1rmb Exp $ * */ @@ -237,13 +237,13 @@ static void demux_aiff_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c index 55e8419f7..7a7791825 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.141 2003/11/15 14:00:39 miguelfreitas Exp $ + * $Id: demux_asf.c,v 1.142 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for asf streams * @@ -304,8 +304,7 @@ static void asf_send_audio_header (demux_asf_t *this, int stream) { buf = this->audio_fifo->buffer_pool_alloc (this->audio_fifo); memcpy (buf->content, this->wavex, this->wavex_size); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, - wavex->wFormatTag); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, wavex->wFormatTag); #ifdef LOG printf ("demux_asf: wavex header is %d bytes long\n", this->wavex_size); @@ -332,8 +331,7 @@ static void asf_send_video_header (demux_asf_t *this, int stream) { buf_element_t *buf; xine_bmiheader *bih = (xine_bmiheader *) this->bih; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, - bih->biCompression); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, bih->biCompression); buf = this->video_fifo->buffer_pool_alloc (this->video_fifo); buf->decoder_flags = BUF_FLAG_HEADER; @@ -385,8 +383,7 @@ static int asf_read_header (demux_asf_t *this) { else this->rate = 0; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, - this->rate*8); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->rate*8); get_le64(this); /* preroll in 1/1000 s*/ flags = get_le32(this); /* flags */ @@ -620,8 +617,8 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start uint32_t bitrate = 0; /* will get overridden later */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); /* * initialize asf engine @@ -651,9 +648,9 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start _x_demux_control_start(this->stream); } - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->title); - xine_set_meta_info(this->stream, XINE_META_INFO_ARTIST, this->author); - xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, this->comment); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->title); + _x_meta_info_set(this->stream, XINE_META_INFO_ARTIST, this->author); + _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT, this->comment); /* Choose the best audio and the best video stream. @@ -672,8 +669,8 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start if ((buf_type == BUF_VIDEO_BASE) && (bitrate > max_vrate || this->video_stream_id == -1)) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, bitrate); max_vrate = bitrate; @@ -682,8 +679,8 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start } else if ((buf_type == BUF_AUDIO_BASE) && (bitrate > max_arate || this->audio_stream_id == -1)) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, bitrate); max_arate = bitrate; @@ -692,15 +689,15 @@ static int demux_asf_send_headers_common (demux_asf_t *this, int send_ctrl_start } } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, bitrate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, bitrate); if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) printf("demux_asf: video stream_id: %d, audio stream_id: %d\n", this->video_stream_id, this->audio_stream_id); - if(xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO)) + if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_AUDIO)) asf_send_audio_header(this, this->audio_stream); - if(xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) + if(_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) asf_send_video_header(this, this->video_stream); } return 0; diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c index 07be650e5..4b3691bf6 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.14 2003/11/15 14:00:40 miguelfreitas Exp $ + * $Id: demux_aud.c,v 1.15 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -195,13 +195,13 @@ static void demux_aud_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_samplerate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index b5f62157a..56d94e6e1 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_avi.c,v 1.178 2003/11/16 00:59:24 tmattern Exp $ + * $Id: demux_avi.c,v 1.179 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for avi streams * @@ -1496,8 +1496,8 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->avi->width); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->avi->height); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->avi->width); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->avi->height); if (this->stream->xine->verbosity >= XINE_VERBOSITY_DEBUG) { for (i=0; i < this->avi->n_audio; i++) @@ -1522,8 +1522,8 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { (int)this->avi->audio[i]->wavex->wFormatTag); } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, !this->no_audio); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, !this->no_audio); /* * send start/header buffers @@ -1547,7 +1547,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { } else this->avi->video_type = _x_fourcc_to_buf_video(this->avi->compressor); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, this->avi->compressor); if (!this->avi->video_type) { @@ -1593,7 +1593,7 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) { } if(this->avi->n_audio == 1) - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, this->avi->audio[0]->wavex->wFormatTag); } diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c index ac6ac1c53..c771d93c6 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.16 2003/11/15 14:00:42 miguelfreitas Exp $ + * $Id: demux_cdda.c,v 1.17 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -112,13 +112,13 @@ static void demux_cdda_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_SEEKABLE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_SEEKABLE, INPUT_IS_SEEKABLE(this->input)); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 2); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 44100); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 2); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 44100); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c index 26a70da8b..7fff96bed 100644 --- a/src/demuxers/demux_eawve.c +++ b/src/demuxers/demux_eawve.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_eawve.c,v 1.24 2003/11/15 14:00:42 miguelfreitas Exp $ + * $Id: demux_eawve.c,v 1.25 2003/11/16 23:33:43 f1rmb Exp $ * * demux_eawve.c, Demuxer plugin for Electronic Arts' WVE file format * @@ -283,11 +283,11 @@ static void demux_eawve_send_headers(demux_plugin_t *this_gen){ this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 2); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 22050); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 2); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 22050); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c index 8e51f4534..147a712e6 100644 --- a/src/demuxers/demux_elem.c +++ b/src/demuxers/demux_elem.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_elem.c,v 1.78 2003/11/15 14:00:43 miguelfreitas Exp $ + * $Id: demux_elem.c,v 1.79 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for elementary mpeg streams */ @@ -132,8 +132,8 @@ static void demux_mpeg_elem_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); } static int demux_mpeg_elem_seek (demux_plugin_t *this_gen, diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index 67504c0e5..b03ca5130 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.69 2003/11/15 14:00:44 miguelfreitas Exp $ + * $Id: demux_film.c,v 1.70 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -662,18 +662,18 @@ static void demux_film_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, (this->video_type) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->audio_type) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, this->video_codec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, this->video_codec); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index dfaaaf176..cec36f2ff 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.47 2003/11/15 14:00:45 miguelfreitas Exp $ + * $Id: demux_fli.c,v 1.48 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -227,11 +227,11 @@ static void demux_fli_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->width); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->width); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->height); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->frame_pts_inc); /* send start buffers */ diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c index bd7c10443..8f2da7dd4 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.47 2003/11/15 14:00:46 miguelfreitas Exp $ + * $Id: demux_idcin.c,v 1.48 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -334,18 +334,18 @@ static int open_idcin_file(demux_idcin_t *this) { return 0; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->wave.nChannels) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, bih->biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, bih->biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave.nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->wave.nSamplesPerSec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->wave.wBitsPerSample); this->filesize = this->input->get_length(this->input) - diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c index 3b238b1dd..51fa41b73 100644 --- a/src/demuxers/demux_image.c +++ b/src/demuxers/demux_image.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_image.c,v 1.10 2003/11/15 14:00:47 miguelfreitas Exp $ + * $Id: demux_image.c,v 1.11 2003/11/16 23:33:43 f1rmb Exp $ * * image dummy demultiplexer */ @@ -90,8 +90,8 @@ static void demux_image_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); this->input->seek (this->input, 0, SEEK_SET); } diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c index a32a125de..b4652b29f 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.18 2003/11/15 14:00:47 miguelfreitas Exp $ + * $Id: demux_ipmovie.c,v 1.19 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -568,10 +568,10 @@ static void demux_ipmovie_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c index cce22ba7a..201802cc7 100644 --- a/src/demuxers/demux_mng.c +++ b/src/demuxers/demux_mng.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mng.c,v 1.14 2003/11/15 14:00:48 miguelfreitas Exp $ + * $Id: demux_mng.c,v 1.15 2003/11/16 23:33:43 f1rmb Exp $ * * demux_mng.c, Demuxer plugin for Multiple-image Network Graphics format * @@ -200,10 +200,10 @@ static void demux_mng_send_headers(demux_mng_t *this){ this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index e69f1ecaa..2663fd074 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_mpeg.c,v 1.128 2003/11/15 14:00:48 miguelfreitas Exp $ + * $Id: demux_mpeg.c,v 1.129 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -890,8 +890,8 @@ static void demux_mpeg_send_headers (demux_plugin_t *this_gen) { * send preview buffers for stream/meta_info */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); this->preview_mode = 1; @@ -912,7 +912,7 @@ static void demux_mpeg_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK ; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); } static int demux_mpeg_seek (demux_plugin_t *this_gen, diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index dd8342312..d444291dd 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.200 2003/11/16 22:20:08 jcdutton Exp $ + * $Id: demux_mpeg_block.c,v 1.201 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for mpeg 1/2 program streams * used with fixed blocksize devices (like dvd/vcd) @@ -1275,9 +1275,9 @@ static void demux_mpeg_block_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); } diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index c2025213f..51706a7fe 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.16 2003/11/16 15:31:51 mroi Exp $ + * $Id: demux_mpeg_pes.c,v 1.17 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for mpeg 2 PES (Packetized Elementary Streams) * reads streams of variable blocksizes @@ -1233,9 +1233,9 @@ static void demux_mpeg_pes_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->rate * 50 * 8); } diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c index 836d4aa95..076d4f396 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.124 2003/11/15 14:00:52 miguelfreitas Exp $ + * $Id: demux_mpgaudio.c,v 1.125 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for mpeg audio (i.e. mp3) streams * @@ -528,10 +528,10 @@ static void read_id3_tags (demux_mpgaudio_t *this) { if ( (tag.tag[0]=='T') && (tag.tag[1]=='A') && (tag.tag[2]=='G') ) { lprintf("id3v1 tag found\n"); - xine_set_metan_info(this->stream, XINE_META_INFO_TITLE, tag.title, 30); - xine_set_metan_info(this->stream, XINE_META_INFO_ARTIST, tag.artist, 30); - xine_set_metan_info(this->stream, XINE_META_INFO_ALBUM, tag.album, 30); - xine_set_metan_info(this->stream, XINE_META_INFO_COMMENT, tag.comment, 30); + _x_meta_info_n_set(this->stream, XINE_META_INFO_TITLE, tag.title, 30); + _x_meta_info_n_set(this->stream, XINE_META_INFO_ARTIST, tag.artist, 30); + _x_meta_info_n_set(this->stream, XINE_META_INFO_ALBUM, tag.album, 30); + _x_meta_info_n_set(this->stream, XINE_META_INFO_COMMENT, tag.comment, 30); } } } @@ -592,27 +592,27 @@ static int id3v22_interp_frame(demux_mpgaudio_t *this, switch (frame_header->id) { case (FOURCC_TAG(0, 'T', 'T', '1')): - xine_set_meta_info(this->stream, XINE_META_INFO_GENRE, buf + 1); + _x_meta_info_set(this->stream, XINE_META_INFO_GENRE, buf + 1); break; case (FOURCC_TAG(0, 'T', 'T', '2')): - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, buf + 1); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, buf + 1); break; case (FOURCC_TAG(0, 'T', 'P', '1')): - xine_set_meta_info(this->stream, XINE_META_INFO_ARTIST, buf + 1); + _x_meta_info_set(this->stream, XINE_META_INFO_ARTIST, buf + 1); break; case (FOURCC_TAG(0, 'T', 'A', 'L')): - xine_set_meta_info(this->stream, XINE_META_INFO_ALBUM, buf + 1); + _x_meta_info_set(this->stream, XINE_META_INFO_ALBUM, buf + 1); break; case (FOURCC_TAG(0, 'T', 'Y', 'E')): - xine_set_meta_info(this->stream, XINE_META_INFO_YEAR, buf + 1); + _x_meta_info_set(this->stream, XINE_META_INFO_YEAR, buf + 1); break; case (FOURCC_TAG(0, 'C', 'O', 'M')): - xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, buf + 1 + 3); + _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT, buf + 1 + 3); break; default: @@ -805,8 +805,8 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; this->check_xing = 1; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); /* read id3 info only from inputs with seeking and without "live" flag */ if ((this->input->get_capabilities(this->input) & (INPUT_CAP_SEEKABLE | INPUT_CAP_SLOW_SEEK)) == INPUT_CAP_SEEKABLE) { @@ -835,16 +835,16 @@ static void demux_mpgaudio_send_headers (demux_plugin_t *this_gen) { } if (this->is_vbr) - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, this->abr); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->abr); else - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, this->br); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->br); if (this->cur_frame.samplerate) { if (this->cur_frame.layer == 1) - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, 384000 / this->cur_frame.samplerate); else - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, 1152000 / this->cur_frame.samplerate); } this->status = DEMUX_OK; diff --git a/src/demuxers/demux_nsf.c b/src/demuxers/demux_nsf.c index f632b37ff..36a56334c 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.18 2003/11/15 14:00:53 miguelfreitas Exp $ + * $Id: demux_nsf.c,v 1.19 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -163,7 +163,7 @@ static int demux_nsf_send_chunk(demux_plugin_t *this_gen) { sprintf(title, "%s, song %d/%d", this->title, this->current_song, this->total_songs); - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, title); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, title); _x_demux_control_newpts(this->stream, this->current_pts, 0); @@ -195,19 +195,19 @@ static void demux_nsf_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, NSF_CHANNELS); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, NSF_SAMPLERATE); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, NSF_BITS); - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->title); - xine_set_meta_info(this->stream, XINE_META_INFO_ARTIST, this->artist); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->title); + _x_meta_info_set(this->stream, XINE_META_INFO_ARTIST, this->artist); sprintf(copyright, "(C) %s", this->copyright); - xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, copyright); + _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT, copyright); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c index b85861dee..97a47213d 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.9 2003/11/15 14:00:54 miguelfreitas Exp $ + * $Id: demux_nsv.c,v 1.10 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -332,13 +332,13 @@ static void demux_nsv_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, (this->video_type) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->audio_type) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 994ccc09f..6cda0b596 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.115 2003/11/15 20:38:27 mroi Exp $ + * $Id: demux_ogg.c,v 1.116 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for ogg streams * @@ -232,7 +232,7 @@ static void get_stream_length (demux_ogg_t *this) { while (!done) { if (!read_ogg_packet (this)) { if (this->time_length) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, ((int64_t) 8000*filelength)/this->time_length); /*this is a fine place to compute avg_bitrate*/ this->avg_bitrate= 8000*filelength/this->time_length; @@ -515,7 +515,7 @@ static void send_ogg_buf (demux_ogg_t *this, comment=*ptr; if ( !strncasecmp ("TITLE=", comment,6) ) { this->title = strdup (comment + strlen ("TITLE=") ); - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->title); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->title); } if ( !chapter_time && strlen(comment) == 22 && !strncasecmp ("CHAPTER" , comment, 7) && @@ -631,7 +631,7 @@ static void send_ogg_buf (demux_ogg_t *this, } else { title = this->title; } - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, title); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, title); lprintf("new TITLE: %s\n", title); uevent.type = XINE_EVENT_UI_SET_TITLE; @@ -752,9 +752,9 @@ static void demux_ogg_send_header (demux_ogg_t *this) { vorbis_comment_init(&vc); if (vorbis_synthesis_headerin(&vi, &vc, &op) >= 0) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, vi.bitrate_nominal); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, vi.rate); this->factor[stream_num] = 90000; @@ -800,7 +800,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) { if (bitrate <= 1) bitrate = 16000; /* assume 16 kbit */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, bitrate); this->factor[stream_num] = 90000; @@ -811,7 +811,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) { lprintf ("detected Speex stream,\trate %d\tbitrate %d\n", header->rate, bitrate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, header->rate); this->preview_buffers[stream_num] += header->extra_headers; @@ -892,11 +892,11 @@ static void demux_ogg_send_header (demux_ogg_t *this) { * video metadata */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, locwidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, locheight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->frame_duration); this->avg_bitrate += 500000; /* FIXME */ @@ -988,13 +988,13 @@ static void demux_ogg_send_header (demux_ogg_t *this) { * audio metadata */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, locchannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, locbits_per_sample); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, locsamples_per_unit); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, locavgbytespersec * 8); } else /* no audio_fifo there */ @@ -1062,11 +1062,11 @@ static void demux_ogg_send_header (demux_ogg_t *this) { * video metadata */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, this->frame_duration); this->avg_bitrate += 500000; /* FIXME */ @@ -1145,18 +1145,18 @@ static void demux_ogg_send_header (demux_ogg_t *this) { this->preview_buffers[stream_num]=3; this->buf_types[stream_num] = BUF_VIDEO_THEORA; - xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "theora"); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "theora"); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->t_info.frame_width); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->t_info.frame_height); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, ((int64_t) 90000 * this->t_info.fps_denominator) / this->t_info.fps_numerator); /*currently aspect_nominator and -denumerator are 0?*/ if (this->t_info.aspect_denominator) - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, ((int64_t) this->t_info.aspect_numerator * 10000) / this->t_info.aspect_denominator); @@ -1175,7 +1175,7 @@ static void demux_ogg_send_header (demux_ogg_t *this) { } #else this->buf_types[stream_num] = BUF_VIDEO_THEORA; - xine_set_meta_info(this->stream, XINE_META_INFO_VIDEOCODEC, "theora"); + _x_meta_info_set(this->stream, XINE_META_INFO_VIDEOCODEC, "theora"); #endif } else { @@ -1433,11 +1433,11 @@ static void demux_ogg_send_headers (demux_plugin_t *this_gen) { lprintf ("headers sent, avg bitrate is %lld\n", this->avg_bitrate); } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, this->num_video_streams > 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, this->num_audio_streams > 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_MAX_SPU_CHANNEL, this->num_spu_streams); } diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c index 82de70f42..a6040ca6d 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.14 2003/11/15 14:00:55 miguelfreitas Exp $ + * $Id: demux_pva.c,v 1.15 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -279,8 +279,8 @@ static void demux_pva_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index 3a4b11d7b..52cc1a28a 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.172 2003/11/15 14:00:56 miguelfreitas Exp $ + * $Id: demux_qt.c,v 1.173 2003/11/16 23:33:43 f1rmb Exp $ * */ @@ -2162,7 +2162,7 @@ static int demux_qt_send_chunk(demux_plugin_t *this_gen) { video_trak->properties->video.edit_list_compensation = 0; } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_FRAME_DURATION, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, frame_duration); debug_video_demux(" qt: sending off video frame %d from offset 0x%llX, %d bytes, media id %d, %lld pts\n", @@ -2351,22 +2351,22 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { video_trak->properties->video.codec_fourcc ) video_trak->properties->video.codec_buftype = BUF_VIDEO_UNKNOWN; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, video_trak->properties->video.codec_fourcc); } else { memset(&this->bih, 0, sizeof(this->bih)); this->bih.biSize = sizeof(this->bih); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, 0); } @@ -2379,35 +2379,35 @@ static void demux_qt_send_headers(demux_plugin_t *this_gen) { audio_trak->properties->audio.codec_fourcc ) audio_trak->properties->audio.codec_buftype = BUF_AUDIO_UNKNOWN; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, audio_trak->properties->audio.channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, audio_trak->properties->audio.sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, audio_trak->properties->audio.bits); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, audio_trak->properties->audio.codec_fourcc); } else { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, 0); } /* copy over the meta information like artist and title */ if (this->qt->copyright) - xine_set_meta_info(this->stream, XINE_META_INFO_ARTIST, this->qt->copyright); + _x_meta_info_set(this->stream, XINE_META_INFO_ARTIST, this->qt->copyright); if (this->qt->name) - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->qt->name); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->qt->name); else if (this->qt->description) - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, this->qt->description); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->qt->description); if (this->qt->comment) - xine_set_meta_info(this->stream, XINE_META_INFO_COMMENT, this->qt->comment); + _x_meta_info_set(this->stream, XINE_META_INFO_COMMENT, this->qt->comment); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c index 5203c45ce..cee1b5c36 100644 --- a/src/demuxers/demux_rawdv.c +++ b/src/demuxers/demux_rawdv.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_rawdv.c,v 1.15 2003/11/15 20:43:11 mroi Exp $ + * $Id: demux_rawdv.c,v 1.16 2003/11/16 23:33:43 f1rmb Exp $ * * demultiplexer for raw dv streams */ @@ -188,7 +188,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) { this->duration = buf->decoder_info[1] = 3003; bih->biWidth = 720; bih->biHeight = 480; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, NTSC_FRAME_SIZE * NTSC_FRAME_RATE * 8); } else { /* PAL */ @@ -196,7 +196,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) { this->duration = buf->decoder_info[1] = 3600; bih->biWidth = 720; bih->biHeight = 576; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, PAL_FRAME_SIZE * PAL_FRAME_RATE * 8); } bih->biSize = sizeof(xine_bmiheader); @@ -213,7 +213,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); if (this->audio_fifo) { int done = 0; @@ -277,7 +277,7 @@ static void demux_raw_dv_send_headers (demux_plugin_t *this_gen) { abuf->decoder_info[2] = 16; /* Audio bits (ffmpeg upsamples 12 to 16bit) */ abuf->decoder_info[3] = 2; /* Audio bits (ffmpeg only supports 2 channels) */ this->audio_fifo->put (this->audio_fifo, abuf); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); } } diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c index 81fb0a48f..f0c613e8a 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.71 2003/11/15 14:01:01 miguelfreitas Exp $ + * $Id: demux_real.c,v 1.72 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -389,7 +389,7 @@ static void real_parse_headers (demux_real_t *this) { if (this->avg_bitrate<1) this->avg_bitrate = 1; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_BITRATE, this->avg_bitrate); } else if (chunk_type == MDPR_TAG) { @@ -469,28 +469,28 @@ unknown: /* load the title string */ field_size = BE_16(&chunk_buffer[stream_ptr]); stream_ptr += 2; - xine_set_metan_info(this->stream, XINE_META_INFO_TITLE, + _x_meta_info_n_set(this->stream, XINE_META_INFO_TITLE, &chunk_buffer[stream_ptr], field_size); stream_ptr += field_size; /* load the author string */ field_size = BE_16(&chunk_buffer[stream_ptr]); stream_ptr += 2; - xine_set_metan_info(this->stream, XINE_META_INFO_ARTIST, + _x_meta_info_n_set(this->stream, XINE_META_INFO_ARTIST, &chunk_buffer[stream_ptr], field_size); stream_ptr += field_size; /* load the copyright string as the year */ field_size = BE_16(&chunk_buffer[stream_ptr]); stream_ptr += 2; - xine_set_metan_info(this->stream, XINE_META_INFO_YEAR, + _x_meta_info_n_set(this->stream, XINE_META_INFO_YEAR, &chunk_buffer[stream_ptr], field_size); stream_ptr += field_size; /* load the comment string */ field_size = BE_16(&chunk_buffer[stream_ptr]); stream_ptr += 2; - xine_set_metan_info(this->stream, XINE_META_INFO_COMMENT, + _x_meta_info_n_set(this->stream, XINE_META_INFO_COMMENT, &chunk_buffer[stream_ptr], field_size); stream_ptr += field_size; } @@ -652,10 +652,10 @@ unknown: this->video_fifo->put (this->video_fifo, buf); /* Set meta info */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC, this->video_stream->fourcc); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_BITRATE, this->video_stream->mdpr->avg_bit_rate); } @@ -682,10 +682,10 @@ unknown: } /* Set meta info */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, this->audio_stream->fourcc); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->audio_stream->mdpr->avg_bit_rate); } } @@ -1145,8 +1145,8 @@ static void demux_real_send_headers(demux_plugin_t *this_gen) { this->input->seek (this->input, 0, SEEK_SET); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); if( !this->reference_mode ) { real_parse_headers (this); diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c index ca03b1a5c..88bdfc9e8 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.26 2003/11/15 14:01:02 miguelfreitas Exp $ + * $Id: demux_realaudio.c,v 1.27 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -159,7 +159,7 @@ static int open_ra_file(demux_ra_t *this) { /* Read title */ len = audio_header[offset]; if(len && ((offset+len+2) < hdr_size)) { - xine_set_metan_info(this->stream, XINE_META_INFO_TITLE, + _x_meta_info_n_set(this->stream, XINE_META_INFO_TITLE, &audio_header[offset+1], len); offset += len+1; } else @@ -168,7 +168,7 @@ static int open_ra_file(demux_ra_t *this) { /* Author */ len = audio_header[offset]; if(len && ((offset+len+1) < hdr_size)) { - xine_set_metan_info(this->stream, XINE_META_INFO_ARTIST, + _x_meta_info_n_set(this->stream, XINE_META_INFO_ARTIST, &audio_header[offset+1], len); offset += len+1; } else @@ -177,7 +177,7 @@ static int open_ra_file(demux_ra_t *this) { /* Copyright/Date */ len = audio_header[offset]; if(len && ((offset+len) <= hdr_size)) { - xine_set_metan_info(this->stream, XINE_META_INFO_YEAR, + _x_meta_info_n_set(this->stream, XINE_META_INFO_YEAR, &audio_header[offset+1], len); offset += len+1; } else @@ -194,7 +194,7 @@ static int open_ra_file(demux_ra_t *this) { } } - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, audio_fourcc); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_FOURCC, audio_fourcc); this->audio_type = _x_formattag_to_buf_audio(audio_fourcc); /* seek to start of data */ @@ -275,13 +275,13 @@ static void demux_ra_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave.nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->wave.nSamplesPerSec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->wave.wBitsPerSample); /* send start buffers */ diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c index f86063f56..785fd78a4 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.46 2003/11/15 14:01:02 miguelfreitas Exp $ + * $Id: demux_roq.c,v 1.47 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -306,18 +306,18 @@ static void demux_roq_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->wave.nChannels) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave.nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, RoQ_AUDIO_SAMPLE_RATE); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c index 2013a3d94..c8c566225 100644 --- a/src/demuxers/demux_slave.c +++ b/src/demuxers/demux_slave.c @@ -21,7 +21,7 @@ */ /* - * $Id: demux_slave.c,v 1.8 2003/11/15 14:01:02 miguelfreitas Exp $ + * $Id: demux_slave.c,v 1.9 2003/11/16 23:33:43 f1rmb Exp $ * * demuxer for slave "protocol" * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is, @@ -283,8 +283,8 @@ static void demux_slave_send_headers (demux_plugin_t *this_gen) { this->status = DEMUX_OK; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); this->last_vpts = 0; this->send_newpts = 1; diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c index dc2bb98f1..fea38c122 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.45 2003/11/15 14:01:02 miguelfreitas Exp $ + * $Id: demux_smjpeg.c,v 1.46 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -312,18 +312,18 @@ static void demux_smjpeg_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->audio_channels) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c index fcc10e9ec..0ac0f4a8c 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.35 2003/11/15 14:01:03 miguelfreitas Exp $ + * $Id: demux_snd.c,v 1.36 2003/11/16 23:33:43 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -208,13 +208,13 @@ static void demux_snd_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c index 9589902cf..00003d69f 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.19 2003/11/15 14:01:03 miguelfreitas Exp $ + * $Id: demux_str.c,v 1.20 2003/11/16 23:33:43 f1rmb Exp $ */ /* @@ -439,9 +439,9 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) { _x_demux_control_start(this->stream); /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_SEEKABLE, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_SEEKABLE, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); for (channel = 0; channel < STR_MAX_CHANNELS; channel++) { if (this->channel_type[channel] & CDXA_TYPE_VIDEO) { @@ -449,11 +449,11 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) { /* FIXME: until I figure out how to comfortably let the user * pick a video channel, just pick a single video channel */ video_channel = this->default_video_channel = channel; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih[channel].biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih[channel].biHeight); /* send init info to video decoder */ @@ -469,14 +469,14 @@ static void demux_str_send_headers(demux_plugin_t *this_gen) { } if (this->channel_type[channel] & CDXA_TYPE_AUDIO) { - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); audio_info = this->audio_info[channel]; - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, (audio_info & 0x01) ? 2 : 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, (audio_info & 0x04) ? 18900 : 37800); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send init info to the audio decoder */ if (this->audio_fifo) { diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 3ca4dcf56..a3ca2781c 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.95 2003/11/16 15:31:51 mroi Exp $ + * $Id: demux_ts.c,v 1.96 2003/11/16 23:33:43 f1rmb Exp $ * * Demultiplexer for MPEG2 Transport Streams. * @@ -1774,8 +1774,8 @@ static void demux_ts_send_headers (demux_plugin_t *this_gen) { this->current_spu_channel = this->stream->spu_channel; /* FIXME ? */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); } static int demux_ts_seek (demux_plugin_t *this_gen, diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c index dee9d2654..6aea2940e 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.35 2003/11/15 14:01:04 miguelfreitas Exp $ + * $Id: demux_voc.c,v 1.36 2003/11/16 23:33:44 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -202,13 +202,13 @@ static void demux_voc_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->audio_channels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->audio_sample_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->audio_bits); /* send start buffers */ diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c index 959a06e9f..4a57231e3 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.10 2003/11/15 14:01:04 miguelfreitas Exp $ + * $Id: demux_vox.c,v 1.11 2003/11/16 23:33:44 f1rmb Exp $ * */ @@ -110,12 +110,12 @@ static void demux_vox_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, DIALOGIC_SAMPLERATE); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, 16); /* send start buffers */ _x_demux_control_start(this->stream); diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c index 6271343ec..bd4ba6297 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.37 2003/11/15 14:01:04 miguelfreitas Exp $ + * $Id: demux_vqa.c,v 1.38 2003/11/16 23:33:44 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -250,18 +250,18 @@ static void demux_vqa_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, (this->wave.nChannels) ? 1 : 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, bih->biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, bih->biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave.nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->wave.nSamplesPerSec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->wave.wBitsPerSample); /* send start buffers */ diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c index bda28783c..326a9da45 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.52 2003/11/15 14:01:05 miguelfreitas Exp $ + * $Id: demux_wav.c,v 1.53 2003/11/16 23:33:44 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -268,13 +268,13 @@ static void demux_wav_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave->nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->wave->nSamplesPerSec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->wave->wBitsPerSample); /* send start buffers */ diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c index de483b843..ff41cd7ae 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.46 2003/11/15 14:01:05 miguelfreitas Exp $ + * $Id: demux_wc3movie.c,v 1.47 2003/11/16 23:33:44 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -290,19 +290,19 @@ static void demux_mve_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); /* this is not strictly correct-- some WC3 MVE files do not contain * audio, but I'm too lazy to check if that is the case */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_CHANNELS, this->wave.nChannels); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->wave.nSamplesPerSec); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITS, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITS, this->wave.wBitsPerSample); /* send start buffers */ @@ -503,7 +503,7 @@ static int open_mve_file(demux_mve_t *this) { this->data_size = this->input->get_length(this->input) - this->data_start; this->video_pts = 0; - xine_set_meta_info(this->stream, XINE_META_INFO_TITLE, title); + _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, title); return 1; } diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c index 02373bf2f..f8952f14d 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.31 2003/11/15 14:01:05 miguelfreitas Exp $ + * $Id: demux_yuv4mpeg2.c,v 1.32 2003/11/16 23:33:44 f1rmb Exp $ */ #ifdef HAVE_CONFIG_H @@ -301,11 +301,11 @@ static void demux_yuv4mpeg2_send_headers(demux_plugin_t *this_gen) { this->status = DEMUX_OK; /* load stream information */ - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO, 1); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_AUDIO, 0); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, + _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_HEIGHT, this->bih.biHeight); /* send start buffers */ diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c index 73dd000a9..c8cd4ce8a 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.11 2003/11/15 14:01:05 miguelfreitas Exp $ + * $Id: demux_yuv_frames.c,v 1.12 2003/11/16 23:33:44 f1rmb Exp $ * * dummy demultiplexer for raw yuv frames (delivered by v4l) */ @@ -91,7 +91,7 @@ static int switch_buf(demux_yuv_frames_t *this , buf_element_t *buf){ result = 1; /* 1, we still should read audio */ break; case BUF_AUDIO_RAWPCM: - if (!xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) + if (!_x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO)) _x_demux_control_newpts(this->stream, buf->pts, 0); this->audio_fifo->put(this->audio_fifo, buf); break; @@ -108,7 +108,7 @@ static int demux_yuv_frames_send_chunk (demux_plugin_t *this_gen){ buf_element_t *buf; do { - if ( xine_get_stream_info(this->stream, XINE_STREAM_INFO_HAS_VIDEO) ) + if ( _x_stream_info_get(this->stream, XINE_STREAM_INFO_HAS_VIDEO) ) buf = this->input->read_block (this->input, this->video_fifo, 0); else buf = this->input->read_block (this->input, this->audio_fifo, 0); |