[patch] amarok-1.1.1-cjk.diff

amarok-1.1.1-cjk.diff (text/plain), 5.20 KB, created by Jackey Yang ("timeout" in forum) on 2004-10-24 20:31:51 UTC

--- amarok-1.1.1/amarok/src/metabundle.cpp.orig	2004-10-09 20:52:09.000000000 +0800
+++ amarok-1.1.1/amarok/src/metabundle.cpp	2004-10-16 09:41:32.627671624 +0800
@@ -9,6 +9,8 @@
 #include <qfile.h>
 
 #include <kfilemetainfo.h>
+#include <kmimetype.h>
+#include <kstringhandler.h>
 
 #include <taglib/audioproperties.h>
 #include <taglib/fileref.h>
@@ -85,15 +87,28 @@
 
 //Taglib::Tag ctor //TODO DEPRECATE
 MetaBundle::MetaBundle( const KURL &url, TagLib::Tag *tag, TagLib::AudioProperties *ap )
-  : m_url( url )
-  , m_title(   TStringToQString( tag->title() ).stripWhiteSpace() )
-  , m_artist(  TStringToQString( tag->artist() ).stripWhiteSpace() )
-  , m_album(   TStringToQString( tag->album() ).stripWhiteSpace() )
-  , m_year(    tag->year() ? QString::number( tag->year() ) : QString::null )
-  , m_comment( TStringToQString( tag->comment() ).stripWhiteSpace() )
-  , m_genre(   TStringToQString( tag->genre() ).stripWhiteSpace() )
-  , m_track(   tag->track() ? QString::number( tag->track() ) : QString::null )
-{
+{  
+	m_url = url;
+	KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
+   
+	if ( result->name() != "audio/x-mp3") {
+    m_title   = TStringToQString( tag->title() ).stripWhiteSpace();
+    m_artist  = TStringToQString( tag->artist() ).stripWhiteSpace();
+    m_album   = TStringToQString( tag->album() ).stripWhiteSpace();
+    m_comment = TStringToQString( tag->comment() ).stripWhiteSpace();
+    m_genre   = TStringToQString( tag->genre() ).stripWhiteSpace();
+    m_year    = tag->year() ? QString::number( tag->year() ) : QString::null;
+    m_track   = tag->track() ? QString::number( tag->track() ) : QString::null;
+	}
+	else {
+	m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
+	m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
+	m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
+	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
+	m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
+	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
+	m_track = tag->track() ? QString::number( tag->track() ) : QString::null; 
+	}
     init( ap );
 }
 
@@ -149,12 +164,15 @@
     {
         TagLib::FileRef f( QFile::encodeName( m_url.path() ), readAudioProperties, TagLib::AudioProperties::Fast );
 
-        if( !f.isNull() )
+        KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
+	
+	if( !f.isNull() )
         {
             if( f.tag() )
             {
                 TagLib::Tag *tag = f.tag();
-
+		
+		if ( result->name() != "audio/x-mp3") {
                 m_title   = TStringToQString( tag->title() ).stripWhiteSpace();
                 m_artist  = TStringToQString( tag->artist() ).stripWhiteSpace();
                 m_album   = TStringToQString( tag->album() ).stripWhiteSpace();
@@ -162,6 +180,16 @@
                 m_genre   = TStringToQString( tag->genre() ).stripWhiteSpace();
                 m_year    = tag->year() ? QString::number( tag->year() ) : QString::null;
                 m_track   = tag->track() ? QString::number( tag->track() ) : QString::null;
+		}
+  		 else {
+   		m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
+   		m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
+   		m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
+   		m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
+   		m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
+   		m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
+   		m_track = tag->track() ? QString::number( tag->track() ) : QString::null; 
+   		}
             }
             init( f.audioProperties() ); //no need to test for the readAudioProperties bool
         }
--- amarok-1.1.1/amarok/src/tagdialog.cpp.org	2004-10-09 20:52:10.000000000 +0800
+++ amarok-1.1.1/amarok/src/tagdialog.cpp	2004-10-23 11:49:02.000000000 +0800
@@ -29,6 +29,7 @@
 #include <krun.h>
 #include <kstandarddirs.h>
 
+#define QStringToMyTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
 
 TagDialog::TagDialog( const KURL& url, QWidget* parent )
     : TagDialogBase( parent )
@@ -461,13 +462,13 @@
         QApplication::setOverrideCursor( KCursor::waitCursor() );
 
         TagLib::Tag * t = f.tag();
-        t->setTitle( QStringToTString( mb.title() ) );
-        t->setArtist( QStringToTString( mb.artist() ) );
-        t->setAlbum( QStringToTString( mb.album() ) );
+        t->setTitle( QStringToMyTString( mb.title() ) );
+        t->setArtist( QStringToMyTString( mb.artist() ) );
+        t->setAlbum( QStringToMyTString( mb.album() ) );
         t->setTrack( mb.track().toInt() );
         t->setYear( mb.year().toInt() );
-        t->setComment( QStringToTString( mb.comment() ) );
-        t->setGenre( QStringToTString( mb.genre() ) );
+        t->setComment( QStringToMyTString( mb.comment() ) );
+        t->setGenre( QStringToMyTString( mb.genre() ) );
 
         bool result = f.save();
         if( result )