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

* Adapted SourcePlaylistInterface & AudioEngine to PlaylistInterface's new signals.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-12-23 08:10:43 +01:00
parent e2812be73a
commit c61a2faa79
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/SourcePlaylistInterface.cpp
View File

@@ -180,8 +180,9 @@ SourcePlaylistInterface::resolvingFinished( bool hasResults )
if ( hasResults ) if ( hasResults )
{ {
m_gotNextItem = true; m_gotNextItem = true;
emit nextTrackAvailable();
} }
emit nextTrackAvailable( hasResults );
} }

18
src/libtomahawk/audio/AudioEngine.cpp
View File

@@ -839,16 +839,16 @@ AudioEngine::setQueue( const playlistinterface_ptr& queue )
{ {
if ( m_queue ) if ( m_queue )
{ {
disconnect( m_queue.data(), SIGNAL( previousTrackAvailable() ), this, SIGNAL( controlStateChanged() ) ); disconnect( m_queue.data(), SIGNAL( previousTrackAvailable( bool ) ), this, SIGNAL( controlStateChanged() ) );
disconnect( m_queue.data(), SIGNAL( nextTrackAvailable() ), this, SIGNAL( controlStateChanged() ) ); disconnect( m_queue.data(), SIGNAL( nextTrackAvailable( bool ) ), this, SIGNAL( controlStateChanged() ) );
} }
m_queue = queue; m_queue = queue;
if ( m_queue ) if ( m_queue )
{ {
connect( m_queue.data(), SIGNAL( previousTrackAvailable() ), SIGNAL( controlStateChanged() ) ); connect( m_queue.data(), SIGNAL( previousTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
connect( m_queue.data(), SIGNAL( nextTrackAvailable() ), SIGNAL( controlStateChanged() ) ); connect( m_queue.data(), SIGNAL( nextTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
} }
} }
@@ -863,8 +863,8 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
{ {
if ( m_playlist.data() ) if ( m_playlist.data() )
{ {
disconnect( m_playlist.data(), SIGNAL( previousTrackAvailable() ) ); disconnect( m_playlist.data(), SIGNAL( previousTrackAvailable( bool ) ) );
disconnect( m_playlist.data(), SIGNAL( nextTrackAvailable() ) ); disconnect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ) );
} }
m_playlist.data()->reset(); m_playlist.data()->reset();
@@ -882,10 +882,10 @@ AudioEngine::setPlaylist( Tomahawk::playlistinterface_ptr playlist )
if ( !m_playlist.isNull() ) if ( !m_playlist.isNull() )
{ {
connect( m_playlist.data(), SIGNAL( nextTrackAvailable() ), SLOT( onPlaylistNextTrackAvailable() ) ); connect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ), SLOT( onPlaylistNextTrackAvailable() ) );
connect( m_playlist.data(), SIGNAL( previousTrackAvailable() ), SIGNAL( controlStateChanged() ) ); connect( m_playlist.data(), SIGNAL( previousTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
connect( m_playlist.data(), SIGNAL( nextTrackAvailable() ), SIGNAL( controlStateChanged() ) ); connect( m_playlist.data(), SIGNAL( nextTrackAvailable( bool ) ), SIGNAL( controlStateChanged() ) );
} }
emit playlistChanged( playlist ); emit playlistChanged( playlist );