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/liba52 | |
| 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/liba52')
| -rw-r--r-- | src/liba52/xine_decoder.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/liba52/xine_decoder.c b/src/liba52/xine_decoder.c index 4c65ee2cc..c5fcacc51 100644 --- a/src/liba52/xine_decoder.c +++ b/src/liba52/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.62 2003/11/16 12:12:09 mroi Exp $ + * $Id: xine_decoder.c,v 1.63 2003/11/16 23:33:44 f1rmb Exp $ * * stuff needed to turn liba52 into a xine decoder plugin */ @@ -521,35 +521,35 @@ static void a52dec_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { #endif this->frame_todo = this->frame_length - 17; this->sync_state = 2; - if (!xine_get_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC) || + if (!_x_meta_info_get(this->stream, XINE_META_INFO_AUDIOCODEC) || a52_flags_old != this->a52_flags || a52_sample_rate_old != this->a52_sample_rate || a52_bit_rate_old != this->a52_bit_rate) { if (((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R) && (this->a52_flags & A52_LFE)) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.1"); else if ((((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) && (this->a52_flags & A52_LFE)) || (((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R) && (this->a52_flags & A52_LFE))) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.1"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F2R) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 5.0"); else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F2R) || ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F1R)) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 4.0"); else if (((this->a52_flags & A52_CHANNEL_MASK) == A52_2F1R) || ((this->a52_flags & A52_CHANNEL_MASK) == A52_3F)) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 3.0"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_STEREO) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (stereo)"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_DOLBY) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 2.0 (dolby)"); else if ((this->a52_flags & A52_CHANNEL_MASK) == A52_MONO) - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52 1.0"); else - xine_set_meta_info(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52"); + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "A/52"); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->a52_bit_rate); - xine_set_stream_info(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->a52_sample_rate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_BITRATE, this->a52_bit_rate); + _x_stream_info_set(this->stream, XINE_STREAM_INFO_AUDIO_SAMPLERATE, this->a52_sample_rate); } } break; |