Attachment #42530 for bug #67915

Lines 9-14 Link Here

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




#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 )

        QApplication::setOverrideCursor( KCursor::waitCursor() );

        TagLib::Tag * t = f.tag();
        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( QStringToMyTString( mb.comment() ) );
        t->setGenre( QStringToMyTString( mb.genre() ) );

        bool result = f.save();
        if( result )

Return to bug 67915

Lines 29-34 Link Here

(-)amarok-1.1.1/amarok/src/tagdialog.cpp.org (-5 / +6 lines)
29	#include <krun.h>	29	#include <krun.h>
30	#include <kstandarddirs.h>	30	#include <kstandarddirs.h>
31		31
		32	#define QStringToMyTString(s) TagLib::String(s.local8Bit().data(), TagLib::String::Latin1)
32		33
33	TagDialog::TagDialog( const KURL& url, QWidget* parent )	34	TagDialog::TagDialog( const KURL& url, QWidget* parent )
34	: TagDialogBase( parent )	35	: TagDialogBase( parent )
Lines 461-473 Link Here
461	QApplication::setOverrideCursor( KCursor::waitCursor() );	462	QApplication::setOverrideCursor( KCursor::waitCursor() );
462		463
463	TagLib::Tag * t = f.tag();	464	TagLib::Tag * t = f.tag();
464	t->setTitle( QStringToTString( mb.title() ) );	465	t->setTitle( QStringToMyTString( mb.title() ) );
465	t->setArtist( QStringToTString( mb.artist() ) );	466	t->setArtist( QStringToMyTString( mb.artist() ) );
466	t->setAlbum( QStringToTString( mb.album() ) );	467	t->setAlbum( QStringToMyTString( mb.album() ) );
467	t->setTrack( mb.track().toInt() );	468	t->setTrack( mb.track().toInt() );
468	t->setYear( mb.year().toInt() );	469	t->setYear( mb.year().toInt() );
469	t->setComment( QStringToTString( mb.comment() ) );	470	t->setComment( QStringToMyTString( mb.comment() ) );
470	t->setGenre( QStringToTString( mb.genre() ) );	471	t->setGenre( QStringToMyTString( mb.genre() ) );
471		472
472	bool result = f.save();	473	bool result = f.save();
473	if( result )	474	if( result )