written by lucida(lucida@lucida.et8.net) 2004/04/15 --- kdemultimedia.orig/kfile-plugins/mp3/kfile_mp3.cpp 2004-04-14 02:25:24.000000000 -0700 +++ kdemultimedia/kfile-plugins/mp3/kfile_mp3.cpp 2004-04-14 02:29:53.000000000 -0700 @@ -47,6 +47,7 @@ } #undef __MAIN #endif +#define MyQStringToTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1) typedef KGenericFactory Mp3Factory; @@ -154,13 +155,13 @@ QString date = file.tag()->year() > 0 ? QString::number(file.tag()->year()) : QString::null; QString track = file.tag()->track() > 0 ? QString::number(file.tag()->track()) : QString::null; - appendItem(id3group, "Title", TStringToQString(file.tag()->title())); - appendItem(id3group, "Artist", TStringToQString(file.tag()->artist())); - appendItem(id3group, "Album", TStringToQString(file.tag()->album())); + appendItem(id3group, "Title", QString::fromLocal8Bit(TStringToQString( file.tag()->title() ).latin1()).stripWhiteSpace()); + appendItem(id3group, "Artist", QString::fromLocal8Bit(TStringToQString( file.tag()->artist() ).latin1()).stripWhiteSpace()); + appendItem(id3group, "Album", QString::fromLocal8Bit(TStringToQString( file.tag()->album() ).latin1()).stripWhiteSpace()); appendItem(id3group, "Date", date); - appendItem(id3group, "Comment", TStringToQString(file.tag()->comment())); + appendItem(id3group, "Comment", QString::fromLocal8Bit(TStringToQString( file.tag()->comment() ).latin1()).stripWhiteSpace()); appendItem(id3group, "Tracknumber", track); - appendItem(id3group, "Genre", TStringToQString(file.tag()->genre())); + appendItem(id3group, "Genre", QString::fromLocal8Bit(TStringToQString( file.tag()->genre() ).latin1()).stripWhiteSpace()); } if(readTech) { @@ -210,7 +211,7 @@ Translator(const KFileMetaInfo &info) : m_info(info) {} TagLib::String operator[](const char *key) const { - return QStringToTString(m_info["id3"][key].value().toString()); + return MyQStringToTString(m_info["id3"][key].value().toString()); } int toInt(const char *key) const {