mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

* Fixed sorting by duration.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-09-15 06:11:12 +02:00
parent 3daf009e01
commit 9dbe62fa6c
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,6 +273,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
const unsigned int albumpos2 = q2->albumpos(); const unsigned int albumpos2 = q2->albumpos();
const unsigned int discnumber1 = q1->discnumber(); const unsigned int discnumber1 = q1->discnumber();
const unsigned int discnumber2 = q2->discnumber(); const unsigned int discnumber2 = q2->discnumber();
unsigned int duration1 = q1->duration(), duration2 = q2->duration();
unsigned int bitrate1 = 0, bitrate2 = 0; unsigned int bitrate1 = 0, bitrate2 = 0;
unsigned int mtime1 = 0, mtime2 = 0; unsigned int mtime1 = 0, mtime2 = 0;
unsigned int size1 = 0, size2 = 0; unsigned int size1 = 0, size2 = 0;
@@ -285,6 +286,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
{ {
const Tomahawk::result_ptr& r = q1->results().at( 0 ); const Tomahawk::result_ptr& r = q1->results().at( 0 );
bitrate1 = r->bitrate(); bitrate1 = r->bitrate();
duration1 = r->duration();
mtime1 = r->modificationTime(); mtime1 = r->modificationTime();
size1 = r->size(); size1 = r->size();
score1 = r->score(); score1 = r->score();
@@ -295,6 +297,7 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
{ {
const Tomahawk::result_ptr& r = q2->results().at( 0 ); const Tomahawk::result_ptr& r = q2->results().at( 0 );
bitrate2 = r->bitrate(); bitrate2 = r->bitrate();
duration2 = r->duration();
mtime2 = r->modificationTime(); mtime2 = r->modificationTime();
size2 = r->size(); size2 = r->size();
score2 = r->score(); score2 = r->score();
@@ -377,6 +380,13 @@ PlayableProxyModel::lessThan( int column, const Tomahawk::query_ptr& q1, const T
return bitrate1 < bitrate2; return bitrate1 < bitrate2;
} }
else if ( column == PlayableModel::Duration ) // sort by duration
{
if ( duration1 == duration2 )
return id1 < id2;
return duration1 < duration2;
}
else if ( column == PlayableModel::Age ) // sort by mtime else if ( column == PlayableModel::Age ) // sort by mtime
{ {
if ( mtime1 == mtime2 ) if ( mtime1 == mtime2 )