summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-12-12 00:41:22 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2004-12-12 00:41:22 +0000
commite306e1ca90ebc38750b3bfa303575bc4245e6f87 (patch)
tree9f69f973ddbbcffc7249beb9e505ca5e4b52fc81
parentf54d66219c485118947678ca8d9e32b04ff03099 (diff)
downloadxine-lib-e306e1ca90ebc38750b3bfa303575bc4245e6f87.tar.gz
xine-lib-e306e1ca90ebc38750b3bfa303575bc4245e6f87.tar.bz2
skip charset conversion. we know freedb proto 6 is already utf-8
CVS patchset: 7224 CVS date: 2004/12/12 00:41:22
-rw-r--r--src/input/input_cdda.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 17e795ae0..9daac2bae 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -20,7 +20,7 @@
* Compact Disc Digital Audio (CDDA) Input Plugin
* by Mike Melanson (melanson@pcisys.net)
*
- * $Id: input_cdda.c,v 1.67 2004/12/09 01:34:31 miguelfreitas Exp $
+ * $Id: input_cdda.c,v 1.68 2004/12/12 00:41:22 miguelfreitas Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1819,7 +1819,7 @@ static void _cdda_cdindex(cdda_input_plugin_t *this, cdrom_toc *toc) {
base64 = rfc822_binary(digest, 20, &size);
base64[size] = 0;
- _x_meta_info_set(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_CDINDEX_DISCID, base64);
free (base64);
}
@@ -2329,31 +2329,31 @@ static int cdda_plugin_open (input_plugin_t *this_gen ) {
if(this->cddb.disc_title) {
lprintf("Disc Title: %s\n", this->cddb.disc_title);
- _x_meta_info_set(this->stream, XINE_META_INFO_ALBUM, this->cddb.disc_title);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_ALBUM, this->cddb.disc_title);
}
if(this->cddb.track[this->track].title) {
lprintf("Track %d Title: %s\n", this->track+1, this->cddb.track[this->track].title);
- _x_meta_info_set(this->stream, XINE_META_INFO_TITLE, this->cddb.track[this->track].title);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_TITLE, this->cddb.track[this->track].title);
}
if(this->cddb.disc_artist) {
lprintf("Disc Artist: %s\n", this->cddb.disc_artist);
- _x_meta_info_set(this->stream, XINE_META_INFO_ARTIST, this->cddb.disc_artist);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_ARTIST, this->cddb.disc_artist);
}
if(this->cddb.disc_category) {
lprintf("Disc Category: %s\n", this->cddb.disc_category);
- _x_meta_info_set(this->stream, XINE_META_INFO_GENRE, this->cddb.disc_category);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_GENRE, this->cddb.disc_category);
}
if(this->cddb.disc_year) {
lprintf("Disc Year: %s\n", this->cddb.disc_year);
- _x_meta_info_set(this->stream, XINE_META_INFO_YEAR, this->cddb.disc_year);
+ _x_meta_info_set_utf8(this->stream, XINE_META_INFO_YEAR, this->cddb.disc_year);
}
free_cdrom_toc(toc);