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

Handle re-latches

Browse Source
This commit is contained in:
Leo Franchi
2011-09-22 18:02:30 -04:00
parent d3ce2162ca
commit f520b6d5d0
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sourcetree/sourcetreeview.cpp
View File

@@ -360,6 +360,7 @@ SourceTreeView::doLatchOn( const source_ptr& source )
PlaylistInterface* pi = AudioEngine::instance()->playlist(); PlaylistInterface* pi = AudioEngine::instance()->playlist();
bool catchUp = false;
if ( pi && dynamic_cast< SourcePlaylistInterface* >( pi ) ) if ( pi && dynamic_cast< SourcePlaylistInterface* >( pi ) )
{ {
SourcePlaylistInterface* sourcepi = dynamic_cast< SourcePlaylistInterface* >( pi ); SourcePlaylistInterface* sourcepi = dynamic_cast< SourcePlaylistInterface* >( pi );
@@ -367,7 +368,8 @@ SourceTreeView::doLatchOn( const source_ptr& source )
{ {
//it's a catch-up -- logic in audioengine should take care of it //it's a catch-up -- logic in audioengine should take care of it
AudioEngine::instance()->next(); AudioEngine::instance()->next();
return; catchUp = true;
m_latch = sourcepi->getSharedPointer();
} }
} }
@@ -378,8 +380,11 @@ SourceTreeView::doLatchOn( const source_ptr& source )
cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() ); cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() );
Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) ); Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
m_waitingToPlayLatch = source; if ( !catchUp )
AudioEngine::instance()->playItem( source->getPlaylistInterface().data(), source->getPlaylistInterface()->nextItem() ); {
m_waitingToPlayLatch = source;
AudioEngine::instance()->playItem( source->getPlaylistInterface().data(), source->getPlaylistInterface()->nextItem() );
}
} }
void void