1.1 --- a/decoder-mp3.c Wed Feb 04 19:34:25 2009 +0800
1.2 +++ b/decoder-mp3.c Thu Feb 12 20:47:23 2009 +0800
1.3 @@ -1,7 +1,7 @@
1.4 /*
1.5 * MP3/MPlayer plugin to VDR (C++)
1.6 *
1.7 - * (C) 2001-2005 Stefan Huelswitt <s.huelswitt@gmx.de>
1.8 + * (C) 2001-2009 Stefan Huelswitt <s.huelswitt@gmx.de>
1.9 *
1.10 * This code is free software; you can redistribute it and/or
1.11 * modify it under the terms of the GNU General Public License
1.12 @@ -369,6 +369,7 @@
1.13 cCacheData *dat=InfoCache.Search(str);
1.14 if(dat) {
1.15 Set(dat); dat->Unlock();
1.16 + ConvertToSys();
1.17 if(!DecoderID) {
1.18 DecoderID=DEC_MP3;
1.19 InfoCache.Cache(this,str);
1.20 @@ -518,6 +519,7 @@
1.21
1.22 if(!has_id3 || !Title) FakeTitle(str->Filename,".mp3");
1.23 InfoCache.Cache(this,str);
1.24 + ConvertToSys();
1.25 }
1.26 }
1.27 return Abort(res);
1.28 @@ -612,12 +614,7 @@
1.29 const id3_ucs4_t *ucs4=id3_field_getstrings(field,0);
1.30 if(!ucs4) return;
1.31 if(!strcmp(id,ID3_FRAME_GENRE)) ucs4=id3_genre_name(ucs4);
1.32 -
1.33 - id3_latin1_t *latin1=id3_ucs4_latin1duplicate(ucs4);
1.34 - if(!latin1) return;
1.35 -
1.36 - data=strdup((char *)latin1);
1.37 - free(latin1);
1.38 + data=(char *)id3_ucs4_utf8duplicate(ucs4);
1.39 }
1.40 }
1.41