mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-03-18 23:09:42 +01:00
Code Issues Releases Wiki Activity

Faster Query comparison.

Browse Source 
Changed the return value of some functions to a reference. All these
functions return the contents of members, i.e. addresses on the heap.
This commit is contained in:
Uwe L. Korn 2014-07-16 08:40:38 +01:00
parent d7abf8ec5b
commit 87ad36e545
5 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libtomahawk/Query.cpp
View File

@ -530,9 +530,9 @@ Query::howSimilar( const Tomahawk::result_ptr& r )
{
Q_D( Query );
// result values
const QString rArtistname = r->track()->artistSortname();
const QString& rArtistname = r->track()->artistSortname();
const QString rAlbumname = r->track()->albumSortname();
const QString rTrackname = r->track()->trackSortname();
const QString& rTrackname = r->track()->trackSortname();
QString qArtistname;
QString qAlbumname;

8
src/libtomahawk/Track.cpp
View File

@ -381,7 +381,7 @@ Track::toQuery()
}
QString
const QString&
Track::composerSortname() const
{
Q_D( const Track );
@ -389,7 +389,7 @@ Track::composerSortname() const
}
QString
const QString&
Track::albumSortname() const
{
Q_D( const Track );
@ -749,7 +749,7 @@ Track::share( const Tomahawk::source_ptr& source )
}
QString
const QString&
Track::artistSortname() const
{
Q_D( const Track );
@ -757,7 +757,7 @@ Track::artistSortname() const
}
QString
const QString&
Track::trackSortname() const
{
Q_D( const Track );

8
src/libtomahawk/Track.h
View File

@ -68,10 +68,10 @@ public:
QString toString() const;
Tomahawk::query_ptr toQuery();
QString composerSortname() const;
QString albumSortname() const;
QString artistSortname() const;
QString trackSortname() const;
const QString& composerSortname() const;
const QString& albumSortname() const;
const QString& artistSortname() const;
const QString& trackSortname() const;
QString artist() const;
QString track() const;

4
src/libtomahawk/TrackData.h
View File

@ -55,8 +55,8 @@ public:
QString toString() const;
Tomahawk::query_ptr toQuery();
QString artistSortname() const { return m_artistSortname; }
QString trackSortname() const { return m_trackSortname; }
const QString& artistSortname() const { return m_artistSortname; }
const QString& trackSortname() const { return m_trackSortname; }
QWeakPointer< Tomahawk::TrackData > weakRef() { return m_ownRef; }
void setWeakRef( QWeakPointer< Tomahawk::TrackData > weakRef ) { m_ownRef = weakRef; }

90
src/libtomahawk/playlist/PlayableProxyModel.cpp
View File

@ -295,52 +295,22 @@ PlayableProxyModel::setMaxVisibleItems( int items )
bool
PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const Tomahawk::query_ptr& q2 ) const
{
// Attention: This function may be called very often!
// So be aware of its performance.
const Tomahawk::track_ptr& t1 = q1->track();
const Tomahawk::track_ptr& t2 = q2->track();
const QString artist1 = t1->artistSortname();
const QString artist2 = t2->artistSortname();
const QString album1 = t1->albumSortname();
const QString album2 = t2->albumSortname();
const QString track1 = t1->trackSortname();
const QString track2 = t2->trackSortname();
const QString composer1 = t1->composerSortname();
const QString composer2 = t2->composerSortname();
const QString& artist1 = t1->artistSortname();
const QString& artist2 = t2->artistSortname();
const QString& album1 = t1->albumSortname();
const QString& album2 = t2->albumSortname();
const unsigned int albumpos1 = t1->albumpos();
const unsigned int albumpos2 = t2->albumpos();
const unsigned int discnumber1 = t1->discnumber();
const unsigned int discnumber2 = t2->discnumber();
unsigned int duration1 = t1->duration(), duration2 = t2->duration();
unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0;
unsigned int size1 = 0, size2 = 0;
unsigned int year1 = 0, year2 = 0;
float score1 = 0, score2 = 0;
QString origin1;
QString origin2;
qint64 id1 = 0, id2 = 0;
if ( !q1->results().isEmpty() )
{
Tomahawk::result_ptr r = q1->results().first();
bitrate1 = r->bitrate();
mtime1 = r->modificationTime();
size1 = r->size();
year1 = r->track()->year();
score1 = r->score();
origin1 = r->friendlySource().toLower();
}
if ( !q2->results().isEmpty() )
{
Tomahawk::result_ptr r = q2->results().first();
bitrate2 = r->bitrate();
mtime2 = r->modificationTime();
size2 = r->size();
year2 = r->track()->year();
score2 = r->score();
origin2 = r->friendlySource().toLower();
}
// This makes it a stable sorter and prevents items from randomly jumping about.
// FIXME: This always true.
if ( id1 == id2 )
{
id1 = (qint64)&q1;
@ -369,7 +339,11 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
return QString::localeAwareCompare( artist1, artist2 ) < 0;
}
else if ( column == PlayableModel::Composer ) // sort by composer
// Sort by Composer
const QString& composer1 = t1->composerSortname();
const QString& composer2 = t2->composerSortname();
if ( column == PlayableModel::Composer )
{
if ( composer1 == composer2 )
{
@ -391,7 +365,9 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
return QString::localeAwareCompare( composer1, composer2 ) < 0;
}
else if ( column == PlayableModel::Album ) // sort by album
// Sort by Album
if ( column == PlayableModel::Album ) // sort by album
{
if ( album1 == album2 )
{
@ -408,7 +384,38 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
return QString::localeAwareCompare( album1, album2 ) < 0;
}
else if ( column == PlayableModel::Bitrate ) // sort by bitrate
// Lazy load these variables, they are not used before.
unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0;
unsigned int size1 = 0, size2 = 0;
unsigned int year1 = 0, year2 = 0;
float score1 = 0, score2 = 0;
QString origin1;
QString origin2;
if ( !q1->results().isEmpty() )
{
Tomahawk::result_ptr r = q1->results().first();
bitrate1 = r->bitrate();
mtime1 = r->modificationTime();
size1 = r->size();
year1 = r->track()->year();
score1 = r->score();
origin1 = r->friendlySource().toLower();
}
if ( !q2->results().isEmpty() )
{
Tomahawk::result_ptr r = q2->results().first();
bitrate2 = r->bitrate();
mtime2 = r->modificationTime();
size2 = r->size();
year2 = r->track()->year();
score2 = r->score();
origin2 = r->friendlySource().toLower();
}
// Sort by bitrate
if ( column == PlayableModel::Bitrate )
{
if ( bitrate1 == bitrate2 )
return id1 < id2;
@ -417,6 +424,9 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
}
else if ( column == PlayableModel::Duration ) // sort by duration
{
unsigned int duration1 = t1->duration();
unsigned int duration2 = t2->duration();
if ( duration1 == duration2 )
return id1 < id2;