[patch] juk-2.0-cjk

juk-2.0-cjk.diff (text/plain), 2.42 KB, created by Jackey Yang ("timeout" in forum) on 2004-05-20 11:35:03 UTC

diff -ruN kdemultimedia.orig/juk/tag.cpp kdemultimedia/juk/tag.cpp
--- kdemultimedia.orig/juk/tag.cpp	2004-02-27 15:57:44.442369712 -0800
+++ kdemultimedia/juk/tag.cpp	2004-02-27 16:01:22.830796712 -0800
@@ -34,6 +34,8 @@
 #include "mediafiles.h"
 #include "stringshare.h"
 
+#define QStringToMyTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
@@ -106,11 +108,11 @@
         file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
 #endif
     if(file && file->isValid() && file->tag()) {
-        file->tag()->setTitle(QStringToTString(m_title));
-        file->tag()->setArtist(QStringToTString(m_artist));
-        file->tag()->setAlbum(QStringToTString(m_album));
-        file->tag()->setGenre(QStringToTString(m_genre));
-        file->tag()->setComment(QStringToTString(m_comment));
+        file->tag()->setTitle(QStringToMyTString(m_title));
+        file->tag()->setArtist(QStringToMyTString(m_artist));
+        file->tag()->setAlbum(QStringToMyTString(m_album));
+        file->tag()->setGenre(QStringToMyTString(m_genre));
+        file->tag()->setComment(QStringToMyTString(m_comment));
         file->tag()->setTrack(m_track);
         file->tag()->setYear(m_year);
 
@@ -226,11 +228,11 @@
     m_info(fileName),
     m_fileName(fileName)
 {
-    m_title   = TStringToQString(file->tag()->title()).stripWhiteSpace();
-    m_artist  = TStringToQString(file->tag()->artist()).stripWhiteSpace();
-    m_album   = TStringToQString(file->tag()->album()).stripWhiteSpace();
-    m_genre   = TStringToQString(file->tag()->genre()).stripWhiteSpace();
-    m_comment = TStringToQString(file->tag()->comment()).stripWhiteSpace();
+    m_title   = QString::fromLocal8Bit(TStringToQString(file->tag()->title()).latin1()).stripWhiteSpace();
+    m_artist  = QString::fromLocal8Bit(TStringToQString(file->tag()->artist()).latin1()).stripWhiteSpace();
+    m_album   = QString::fromLocal8Bit(TStringToQString(file->tag()->album()).latin1()).stripWhiteSpace();
+    m_genre   = QString::fromLocal8Bit(TStringToQString(file->tag()->genre()).latin1()).stripWhiteSpace();
+    m_comment = QString::fromLocal8Bit(TStringToQString(file->tag()->comment()).latin1()).stripWhiteSpace();
 
     m_track = file->tag()->track();
     m_year  = file->tag()->year();