[patch] amarok-1.1.1-cjk.diff

amarok-1.1.1-cjk.diff (text/plain), 4.20 KB, created by Jackey Yang ("timeout" in forum) on 2004-10-17 11:47:38 UTC

diff -Nur amarok-1.1.1/amarok/src/metabundle.cpp amarok-1.1.1.cjk/amarok/src/metabundle.cpp
--- amarok-1.1.1/amarok/src/metabundle.cpp	2004-10-09 09:52:09.000000000 -0300
+++ amarok-1.1.1.cjk/amarok/src/metabundle.cpp	2004-10-17 15:37:54.891007576 -0300
@@ -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,30 @@
 
 //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 +166,15 @@
     {
         TagLib::FileRef f( QFile::encodeName( m_url.path() ), readAudioProperties, TagLib::AudioProperties::Fast );
 
+	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,7 +182,17 @@
                 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
         }
         else init( KFileMetaInfo( m_url, QString::null, KFileMetaInfo::Everything ) );