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

Fix some moer stuff

Browse Source
This commit is contained in:
Leo Franchi
2011-09-28 19:36:02 -04:00
parent cfa5c9932e
commit 757f1c6175
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/libtomahawk/LatchManager.cpp
View File

@@ -88,29 +88,10 @@ LatchManager::playlistChanged( PlaylistInterface* )
} }
// We're current latched, and the user changed playlist, so stop // We're current latched, and the user changed playlist, so stop
const PlaylistInterface* pi = AudioEngine::instance()->playlist();
bool listeningAlong = false;
source_ptr newSource;
if ( pi && dynamic_cast< const SourcePlaylistInterface* >( pi ) )
{
// Check if we're listening along to someone, to make sure it's not the same person
const SourcePlaylistInterface* sourcepi = dynamic_cast< const SourcePlaylistInterface* >( pi );
if ( !AudioEngine::instance()->state() == AudioEngine::Stopped )
{
listeningAlong = true;
newSource = sourcepi->source();
}
}
SourcePlaylistInterface* origsourcepi = dynamic_cast< SourcePlaylistInterface* >( m_latchedInterface.data() ); SourcePlaylistInterface* origsourcepi = dynamic_cast< SourcePlaylistInterface* >( m_latchedInterface.data() );
Q_ASSERT( origsourcepi ); Q_ASSERT( origsourcepi );
const source_ptr source = origsourcepi->source(); const source_ptr source = origsourcepi->source();
// if we're currently listening along to the same source, no change
if ( listeningAlong && ( !origsourcepi->source().isNull() && origsourcepi->source()->id() == newSource->id() ) )
return;
DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction(); DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction();
cmd->setSource( SourceList::instance()->getLocal() ); cmd->setSource( SourceList::instance()->getLocal() );
cmd->setAction( "latchOff"); cmd->setAction( "latchOff");

2
src/sourcetree/sourcetreeview.cpp
View File

@@ -349,7 +349,7 @@ SourceTreeView::latchOnOrCatchUp()
if ( m_latchManager->isLatched( source ) ) if ( m_latchManager->isLatched( source ) )
emit catchUpRequest(); emit catchUpRequest();
else
emit latchRequest( source ); emit latchRequest( source );
} }