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/juk/tag.cpp (-10 / +12 lines)
Lines 34-39 Link Here
34
#include "mediafiles.h"
34
#include "mediafiles.h"
35
#include "stringshare.h"
35
#include "stringshare.h"
36
36
37
#define QStringToMyTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
38
37
////////////////////////////////////////////////////////////////////////////////
39
////////////////////////////////////////////////////////////////////////////////
38
// public members
40
// public members
39
////////////////////////////////////////////////////////////////////////////////
41
////////////////////////////////////////////////////////////////////////////////
Lines 106-116 Link Here
106
        file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
108
        file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
107
#endif
109
#endif
108
    if(file && file->isValid() && file->tag()) {
110
    if(file && file->isValid() && file->tag()) {
109
        file->tag()->setTitle(QStringToTString(m_title));
111
        file->tag()->setTitle(QStringToMyTString(m_title));
110
        file->tag()->setArtist(QStringToTString(m_artist));
112
        file->tag()->setArtist(QStringToMyTString(m_artist));
111
        file->tag()->setAlbum(QStringToTString(m_album));
113
        file->tag()->setAlbum(QStringToMyTString(m_album));
112
        file->tag()->setGenre(QStringToTString(m_genre));
114
        file->tag()->setGenre(QStringToMyTString(m_genre));
113
        file->tag()->setComment(QStringToTString(m_comment));
115
        file->tag()->setComment(QStringToMyTString(m_comment));
114
        file->tag()->setTrack(m_track);
116
        file->tag()->setTrack(m_track);
115
        file->tag()->setYear(m_year);
117
        file->tag()->setYear(m_year);
116
118
Lines 226-236 Link Here
226
    m_info(fileName),
228
    m_info(fileName),
227
    m_fileName(fileName)
229
    m_fileName(fileName)
228
{
230
{
229
    m_title   = TStringToQString(file->tag()->title()).stripWhiteSpace();
231
    m_title   = QString::fromLocal8Bit(TStringToQString(file->tag()->title()).latin1()).stripWhiteSpace();
230
    m_artist  = TStringToQString(file->tag()->artist()).stripWhiteSpace();
232
    m_artist  = QString::fromLocal8Bit(TStringToQString(file->tag()->artist()).latin1()).stripWhiteSpace();
231
    m_album   = TStringToQString(file->tag()->album()).stripWhiteSpace();
233
    m_album   = QString::fromLocal8Bit(TStringToQString(file->tag()->album()).latin1()).stripWhiteSpace();
232
    m_genre   = TStringToQString(file->tag()->genre()).stripWhiteSpace();
234
    m_genre   = QString::fromLocal8Bit(TStringToQString(file->tag()->genre()).latin1()).stripWhiteSpace();
233
    m_comment = TStringToQString(file->tag()->comment()).stripWhiteSpace();
235
    m_comment = QString::fromLocal8Bit(TStringToQString(file->tag()->comment()).latin1()).stripWhiteSpace();
234
236
235
    m_track = file->tag()->track();
237
    m_track = file->tag()->track();
236
    m_year  = file->tag()->year();
238
    m_year  = file->tag()->year();

Return to bug 51582