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

* RecentlyPlayedModel needs to use Source's new signal.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2013-04-23 12:39:31 +02:00
parent ad314585b9
commit d9a82109f5
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libtomahawk/playlist/RecentlyPlayedModel.cpp
View File

@@ -101,24 +101,25 @@ RecentlyPlayedModel::setSource( const Tomahawk::source_ptr& source )
void void
RecentlyPlayedModel::onSourceAdded( const Tomahawk::source_ptr& source ) RecentlyPlayedModel::onSourceAdded( const Tomahawk::source_ptr& source )
{ {
connect( source.data(), SIGNAL( playbackFinished( Tomahawk::track_ptr, unsigned int, unsigned int ) ), SLOT( onPlaybackFinished( Tomahawk::track_ptr, unsigned int, unsigned int ) ), Qt::UniqueConnection ); connect( source.data(), SIGNAL( playbackFinished( Tomahawk::track_ptr, Tomahawk::PlaybackLog ) ),
SLOT( onPlaybackFinished( Tomahawk::track_ptr, Tomahawk::PlaybackLog ) ), Qt::UniqueConnection );
} }
void void
RecentlyPlayedModel::onPlaybackFinished( const Tomahawk::track_ptr& track, unsigned int playtime, unsigned int secsPlayed ) RecentlyPlayedModel::onPlaybackFinished( const Tomahawk::track_ptr& track, const Tomahawk::PlaybackLog& log )
{ {
int count = trackCount(); int count = trackCount();
if ( count ) if ( count )
{ {
PlayableItem* oldestItem = itemFromIndex( index( count - 1, 0, QModelIndex() ) ); PlayableItem* oldestItem = itemFromIndex( index( count - 1, 0, QModelIndex() ) );
if ( oldestItem->playbackLog().timestamp >= playtime ) if ( oldestItem->playbackLog().timestamp >= log.timestamp )
return; return;
PlayableItem* youngestItem = itemFromIndex( index( 0, 0, QModelIndex() ) ); PlayableItem* youngestItem = itemFromIndex( index( 0, 0, QModelIndex() ) );
if ( youngestItem->playbackLog().timestamp <= playtime ) if ( youngestItem->playbackLog().timestamp <= log.timestamp )
insertQuery( track->toQuery(), 0 ); insertQuery( track->toQuery(), 0, log );
else else
{ {
for ( int i = 0; i < count - 1; i++ ) for ( int i = 0; i < count - 1; i++ )
@@ -126,16 +127,16 @@ RecentlyPlayedModel::onPlaybackFinished( const Tomahawk::track_ptr& track, unsig
PlayableItem* item1 = itemFromIndex( index( i, 0, QModelIndex() ) ); PlayableItem* item1 = itemFromIndex( index( i, 0, QModelIndex() ) );
PlayableItem* item2 = itemFromIndex( index( i + 1, 0, QModelIndex() ) ); PlayableItem* item2 = itemFromIndex( index( i + 1, 0, QModelIndex() ) );
if ( item1->playbackLog().timestamp >= playtime && item2->playbackLog().timestamp <= playtime ) if ( item1->playbackLog().timestamp >= log.timestamp && item2->playbackLog().timestamp <= log.timestamp )
{ {
insertQuery( track->toQuery(), i + 1 ); insertQuery( track->toQuery(), i + 1, log );
break; break;
} }
} }
} }
} }
else else
insertQuery( track->toQuery(), 0 ); insertQuery( track->toQuery(), 0, log );
if ( trackCount() > (int)m_limit ) if ( trackCount() > (int)m_limit )
remove( m_limit ); remove( m_limit );

2
src/libtomahawk/playlist/RecentlyPlayedModel.h
View File

@@ -47,7 +47,7 @@ private slots:
void onSourcesReady(); void onSourcesReady();
void onSourceAdded( const Tomahawk::source_ptr& source ); void onSourceAdded( const Tomahawk::source_ptr& source );
void onPlaybackFinished( const Tomahawk::track_ptr& track, unsigned int playtime, unsigned int secsPlayed ); void onPlaybackFinished( const Tomahawk::track_ptr& track, const Tomahawk::PlaybackLog& log );
void loadHistory(); void loadHistory();
private: private: