|
Lines 9-14
Link Here
|
| 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 ) |
|
|
| 89 |
, m_title( TStringToQString( tag->title() ).stripWhiteSpace() ) |
| 90 |
, m_artist( TStringToQString( tag->artist() ).stripWhiteSpace() ) |
| 91 |
, m_album( TStringToQString( tag->album() ).stripWhiteSpace() ) |
| 92 |
, m_year( tag->year() ? QString::number( tag->year() ) : QString::null ) |
| 93 |
, m_comment( TStringToQString( tag->comment() ).stripWhiteSpace() ) |
| 94 |
, m_genre( TStringToQString( tag->genre() ).stripWhiteSpace() ) |
| 95 |
, m_track( tag->track() ? QString::number( tag->track() ) : QString::null ) |
| 96 |
{ |
90 |
{ |
|
|
91 |
m_url = url; |
| 92 |
KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true); |
| 93 |
|
| 94 |
if ( result->name() != "audio/x-mp3") { |
| 95 |
m_title = TStringToQString( tag->title() ).stripWhiteSpace(); |
| 96 |
m_artist = TStringToQString( tag->artist() ).stripWhiteSpace(); |
| 97 |
m_album = TStringToQString( tag->album() ).stripWhiteSpace(); |
| 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 |
} |
| 112 |
|
| 113 |
|
| 97 |
init( ap ); |
114 |
init( ap ); |
| 98 |
} |
115 |
} |
| 99 |
|
116 |
|
|
Lines 149-160
Link Here
|
| 149 |
{ |
166 |
{ |
| 150 |
TagLib::FileRef f( QFile::encodeName( m_url.path() ), readAudioProperties, TagLib::AudioProperties::Fast ); |
167 |
TagLib::FileRef f( QFile::encodeName( m_url.path() ), readAudioProperties, TagLib::AudioProperties::Fast ); |
| 151 |
|
168 |
|
|
|
169 |
KMimeType::Ptr result = KMimeType::findByURL(m_url, 0, true, true); |
| 170 |
|
| 152 |
if( !f.isNull() ) |
171 |
if( !f.isNull() ) |
| 153 |
{ |
172 |
{ |
| 154 |
if( f.tag() ) |
173 |
if( f.tag() ) |
| 155 |
{ |
174 |
{ |
| 156 |
TagLib::Tag *tag = f.tag(); |
175 |
TagLib::Tag *tag = f.tag(); |
| 157 |
|
176 |
|
|
|
177 |
if ( result->name() != "audio/x-mp3") { |
| 158 |
m_title = TStringToQString( tag->title() ).stripWhiteSpace(); |
178 |
m_title = TStringToQString( tag->title() ).stripWhiteSpace(); |
| 159 |
m_artist = TStringToQString( tag->artist() ).stripWhiteSpace(); |
179 |
m_artist = TStringToQString( tag->artist() ).stripWhiteSpace(); |
| 160 |
m_album = TStringToQString( tag->album() ).stripWhiteSpace(); |
180 |
m_album = TStringToQString( tag->album() ).stripWhiteSpace(); |
|
Lines 162-168
Link Here
|
| 162 |
m_genre = TStringToQString( tag->genre() ).stripWhiteSpace(); |
182 |
m_genre = TStringToQString( tag->genre() ).stripWhiteSpace(); |
| 163 |
m_year = tag->year() ? QString::number( tag->year() ) : QString::null; |
183 |
m_year = tag->year() ? QString::number( tag->year() ) : QString::null; |
| 164 |
m_track = tag->track() ? QString::number( tag->track() ) : QString::null; |
184 |
m_track = tag->track() ? QString::number( tag->track() ) : QString::null; |
| 165 |
} |
185 |
} else { |
|
|
186 |
m_title = KStringHandler::from8Bit( TStringToQString(tag->title()).latin1()).stripWhiteSpace(); |
| 187 |
m_artist = KStringHandler::from8Bit( TStringToQString(tag->artist()).latin1()).stripWhiteSpace(); |
| 188 |
m_album = KStringHandler::from8Bit( TStringToQString(tag->album()).latin1()).stripWhiteSpace(); |
| 189 |
m_year = tag->year() ? QString::number( tag->year() ) : QString::null; |
| 190 |
m_comment = KStringHandler::from8Bit( TStringToQString(tag->comment()).latin1()).stripWhiteSpace(); |
| 191 |
m_genre = TStringToQString( tag->genre() ).stripWhiteSpace(); |
| 192 |
m_track = tag->track() ? QString::number( tag->track() ) : QString::null; |
| 193 |
} |
| 194 |
|
| 195 |
} |
| 166 |
init( f.audioProperties() ); //no need to test for the readAudioProperties bool |
196 |
init( f.audioProperties() ); //no need to test for the readAudioProperties bool |
| 167 |
} |
197 |
} |
| 168 |
else init( KFileMetaInfo( m_url, QString::null, KFileMetaInfo::Everything ) ); |
198 |
else init( KFileMetaInfo( m_url, QString::null, KFileMetaInfo::Everything ) ); |
