Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 51582 | Differences between
and this patch

Collapse All | Expand All

(-)kdemultimedia.orig/kfile-plugins/mp3/kfile_mp3.cpp (-6 / +7 lines)
Lines 47-52 Link Here
47
}
47
}
48
#undef __MAIN
48
#undef __MAIN
49
#endif
49
#endif
50
#define MyQStringToTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
50
51
51
typedef KGenericFactory<KMp3Plugin> Mp3Factory;
52
typedef KGenericFactory<KMp3Plugin> Mp3Factory;
52
53
Lines 154-166 Link Here
154
        QString date  = file.tag()->year() > 0 ? QString::number(file.tag()->year()) : QString::null;
155
        QString date  = file.tag()->year() > 0 ? QString::number(file.tag()->year()) : QString::null;
155
        QString track = file.tag()->track() > 0 ? QString::number(file.tag()->track()) : QString::null;
156
        QString track = file.tag()->track() > 0 ? QString::number(file.tag()->track()) : QString::null;
156
157
157
        appendItem(id3group, "Title",       TStringToQString(file.tag()->title()));
158
        appendItem(id3group, "Title",       QString::fromLocal8Bit(TStringToQString( file.tag()->title() ).latin1()).stripWhiteSpace());
158
        appendItem(id3group, "Artist",      TStringToQString(file.tag()->artist()));
159
        appendItem(id3group, "Artist",      QString::fromLocal8Bit(TStringToQString( file.tag()->artist() ).latin1()).stripWhiteSpace());
159
        appendItem(id3group, "Album",       TStringToQString(file.tag()->album()));
160
        appendItem(id3group, "Album",       QString::fromLocal8Bit(TStringToQString( file.tag()->album() ).latin1()).stripWhiteSpace());
160
        appendItem(id3group, "Date",        date);
161
        appendItem(id3group, "Date",        date);
161
        appendItem(id3group, "Comment",     TStringToQString(file.tag()->comment()));
162
        appendItem(id3group, "Comment",     QString::fromLocal8Bit(TStringToQString( file.tag()->comment() ).latin1()).stripWhiteSpace());
162
        appendItem(id3group, "Tracknumber", track);
163
        appendItem(id3group, "Tracknumber", track);
163
        appendItem(id3group, "Genre",       TStringToQString(file.tag()->genre()));
164
        appendItem(id3group, "Genre",       QString::fromLocal8Bit(TStringToQString( file.tag()->genre() ).latin1()).stripWhiteSpace());
164
    }
165
    }
165
166
166
    if(readTech) {
167
    if(readTech) {
Lines 210-216 Link Here
210
    Translator(const KFileMetaInfo &info) : m_info(info) {}
211
    Translator(const KFileMetaInfo &info) : m_info(info) {}
211
    TagLib::String operator[](const char *key) const
212
    TagLib::String operator[](const char *key) const
212
    {
213
    {
213
        return QStringToTString(m_info["id3"][key].value().toString());
214
        return MyQStringToTString(m_info["id3"][key].value().toString());
214
    }
215
    }
215
    int toInt(const char *key) const
216
    int toInt(const char *key) const
216
    {
217
    {

Return to bug 51582