[patch] amarok-1.0.2-cjk.diff

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

diff -Nur amarok-1.0.2/amarok/src/metabundle.cpp amarok-1.0.2.cjk/amarok/src/metabundle.cpp
--- amarok-1.0.2/amarok/src/metabundle.cpp	2004-06-21 10:05:05.000000000 -0300
+++ amarok-1.0.2.cjk/amarok/src/metabundle.cpp	2004-10-17 15:24:24.012279880 -0300
@@ -8,7 +8,8 @@
 #include <qstring.h>
 
 #include <kfilemetainfo.h>
-
+#include <kmimetype.h>
+#include <kstringhandler.h>
 #include <taglib/tag.h>
 #include <taglib/fileref.h>
 #include <taglib/tstring.h>
@@ -89,15 +90,29 @@
 
 //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 );
 }
 
@@ -150,12 +165,14 @@
 
    TagLib::FileRef f( m_url.path().local8Bit(), audioProperties, 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();
@@ -163,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() );
     }