diff options
| author | Bastien Nocera <hadess@users.sourceforge.net> | 2004-09-21 14:23:20 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@users.sourceforge.net> | 2004-09-21 14:23:20 +0000 |
| commit | 994bfada1f38203912b44ad1348857f742459fad (patch) | |
| tree | 54527e8f923fe8d1bf6bfb4e5339b8ff068d9d23 /src/libreal/audio_decoder.c | |
| parent | d07b74f7272f2e8964a32448b9b5983d851dca16 (diff) | |
| download | xine-lib-994bfada1f38203912b44ad1348857f742459fad.tar.gz xine-lib-994bfada1f38203912b44ad1348857f742459fad.tar.bz2 | |
- Set the Codec name meta info even if we can't load the libraries, otherwise
we can't tell the user which codec isn't working (Gnome BZ 151662)
CVS patchset: 6985
CVS date: 2004/09/21 14:23:20
Diffstat (limited to 'src/libreal/audio_decoder.c')
| -rw-r--r-- | src/libreal/audio_decoder.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/libreal/audio_decoder.c b/src/libreal/audio_decoder.c index 21a361e68..d37689a49 100644 --- a/src/libreal/audio_decoder.c +++ b/src/libreal/audio_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_decoder.c,v 1.39 2004/07/25 17:44:10 mroi Exp $ + * $Id: audio_decoder.c,v 1.40 2004/09/21 14:23:20 hadess Exp $ * * thin layer to use real binary-only codecs in xine * @@ -240,36 +240,35 @@ static int init_codec (realdec_decoder_t *this, buf_element_t *buf) { switch (buf->type) { case BUF_AUDIO_COOK: + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook"); if (!load_syms_linux (this, "cook.so.6.0")) return 0; - - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Cook"); break; case BUF_AUDIO_ATRK: + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac"); if (!load_syms_linux (this, "atrc.so.6.0")) return 0; this->block_align = 384; - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Atrac"); break; case BUF_AUDIO_14_4: + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4"); if (!load_syms_linux (this, "14_4.so.6.0")) return 0; - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 14.4"); break; case BUF_AUDIO_28_8: + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8"); if (!load_syms_linux (this, "28_8.so.6.0")) return 0; - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Real 28.8"); break; case BUF_AUDIO_SIPRO: + _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro"); if (!load_syms_linux (this, "sipr.so.6.0")) return 0; /* this->block_align = 19; */ - _x_meta_info_set(this->stream, XINE_META_INFO_AUDIOCODEC, "Sipro"); break; default: |