Attachment #42045 for bug #67915




#include <qstring.h>

#include <kfilemetainfo.h>
#include <kmimetype.h>
#include <kstringhandler.h>
#include <taglib/tag.h>
#include <taglib/fileref.h>
#include <taglib/tstring.h>


//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 );
}



   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();

            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() );
    }

Return to bug 67915

Lines 8-14 Link Here

(-)amarok-1.0.2/amarok/src/metabundle.cpp (-10 / +37 lines)
8	#include <qstring.h>	8	#include <qstring.h>
9		9
10	#include <kfilemetainfo.h>	10	#include <kfilemetainfo.h>
11		11	#include <kmimetype.h>
		12	#include <kstringhandler.h>
12	#include <taglib/tag.h>	13	#include <taglib/tag.h>
13	#include <taglib/fileref.h>	14	#include <taglib/fileref.h>
14	#include <taglib/tstring.h>	15	#include <taglib/tstring.h>
Lines 89-103 Link Here
89		90
90	//Taglib::Tag ctor //TODO DEPRECATE	91	//Taglib::Tag ctor //TODO DEPRECATE
91	MetaBundle::MetaBundle( const KURL &url, TagLib::Tag tag, TagLib::AudioProperties ap )	92	MetaBundle::MetaBundle( const KURL &url, TagLib::Tag tag, TagLib::AudioProperties ap )
92	: m_url( url )
93	, m_title( TStringToQString( tag->title() ).stripWhiteSpace() )
94	, m_artist( TStringToQString( tag->artist() ).stripWhiteSpace() )
95	, m_album( TStringToQString( tag->album() ).stripWhiteSpace() )
96	, m_year( tag->year() ? QString::number( tag->year() ) : QString::null )
97	, m_comment( TStringToQString( tag->comment() ).stripWhiteSpace() )
98	, m_genre( TStringToQString( tag->genre() ).stripWhiteSpace() )
99	, m_track( tag->track() ? QString::number( tag->track() ) : QString::null )
100	{	93	{
		94	m_url = url;
		95	KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
		96
		97	if ( result->name() != "audio/x-mp3") {
		98	m_title = TStringToQString( tag->title() ).stripWhiteSpace();
		99	m_artist = TStringToQString( tag->artist() ).stripWhiteSpace();
		100	m_album = TStringToQString( tag->album() ).stripWhiteSpace();
		101	m_comment = TStringToQString( tag->comment() ).stripWhiteSpace();
		102	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
		103	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
		104	m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
		105	}
		106	else {
		107	m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
		108	m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
		109	m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
		110	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
		111	m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
		112	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
		113	m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
		114	}
		115
101	init( ap );	116	init( ap );
102	}	117	}
103		118
Lines 150-161 Link Here
150		165
151	TagLib::FileRef f( m_url.path().local8Bit(), audioProperties, TagLib::AudioProperties::Fast );	166	TagLib::FileRef f( m_url.path().local8Bit(), audioProperties, TagLib::AudioProperties::Fast );
152		167
		168	KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true);
		169
153	if ( !f.isNull() )	170	if ( !f.isNull() )
154	{	171	{
155	if( f.tag() )	172	if( f.tag() )
156	{	173	{
157	TagLib::Tag *tag = f.tag();	174	TagLib::Tag *tag = f.tag();
158		175	if ( result->name() != "audio/x-mp3") {
159	m_title = TStringToQString( tag->title() ).stripWhiteSpace();	176	m_title = TStringToQString( tag->title() ).stripWhiteSpace();
160	m_artist = TStringToQString( tag->artist() ).stripWhiteSpace();	177	m_artist = TStringToQString( tag->artist() ).stripWhiteSpace();
161	m_album = TStringToQString( tag->album() ).stripWhiteSpace();	178	m_album = TStringToQString( tag->album() ).stripWhiteSpace();
Lines 163-168 Link Here
163	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();	180	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
164	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;	181	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
165	m_track = tag->track() ? QString::number( tag->track() ) : QString::null;	182	m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
		183	} else {
		184	m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace();
		185	m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace();
		186	m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace();
		187	m_year = tag->year() ? QString::number( tag->year() ) : QString::null;
		188	m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace();
		189	m_genre = TStringToQString( tag->genre() ).stripWhiteSpace();
		190	m_track = tag->track() ? QString::number( tag->track() ) : QString::null;
		191	}
		192
166	}	193	}
167	init( f.audioProperties() );	194	init( f.audioProperties() );
168	}	195	}