diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2003-11-16 23:33:42 +0000 |
| commit | 847f0e85e8b0c8135294258a9507fba03cc1cc30 (patch) | |
| tree | 0a74838023ea90c3bb53c7c4f737bab5dc84e427 /src/demuxers/demux_str.c | |
| parent | b88ff04361ced758928d2ad8b87cb8986d044a35 (diff) | |
| download | xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.gz xine-lib-847f0e85e8b0c8135294258a9507fba03cc1cc30.tar.bz2 | |
New stream/meta info (safe) stuff.
BIG NOTE: use helpers to access to these informations (get/set/reset):
_x_{stream,meta}_info_{get,set,reset}()
are for internal use, don't use *_public() ones from inside the beast ;-)
Some wrongly names "xine_" fonction renaming.
CVS patchset: 5757
CVS date: 2003/11/16 23:33:42
Diffstat (limited to 'src/demuxers/demux_str.c')
| -rw-r--r-- | src/demuxers/demux_str.c | 22 |
1 files changed, 11 insertions, 11 deletions
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) { |