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

Add reset logic to interface for use by all; fixes bug when re-listening to a source before a track change

Browse Source
This commit is contained in:
Jeff Mitchell
2011-06-20 08:27:58 -04:00
parent ec83adcd39
commit 189f3b4aff
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libtomahawk/audio/audioengine.cpp
View File

@@ -145,6 +145,9 @@ AudioEngine::stop()
m_mediaObject->stop(); m_mediaObject->stop();
m_retryTimer.stop(); m_retryTimer.stop();
if ( m_playlist )
m_playlist->reset();
setCurrentTrack( Tomahawk::result_ptr() ); setCurrentTrack( Tomahawk::result_ptr() );
emit stopped(); emit stopped();
@@ -380,6 +383,9 @@ AudioEngine::playItem( Tomahawk::PlaylistInterface* playlist, const Tomahawk::re
{ {
qDebug() << Q_FUNC_INFO; qDebug() << Q_FUNC_INFO;
if ( m_playlist )
m_playlist->reset();
setPlaylist( playlist ); setPlaylist( playlist );
m_currentTrackPlaylist = playlist; m_currentTrackPlaylist = playlist;
@@ -452,6 +458,8 @@ AudioEngine::timerTriggered( qint64 time )
void void
AudioEngine::setPlaylist( PlaylistInterface* playlist ) AudioEngine::setPlaylist( PlaylistInterface* playlist )
{ {
if ( m_playlist )
m_playlist->reset();
m_playlist = playlist; m_playlist = playlist;
emit playlistChanged( playlist ); emit playlistChanged( playlist );
} }

2
src/libtomahawk/playlistinterface.h
View File

@@ -65,6 +65,8 @@ public:
virtual QString filter() const { return m_filter; } virtual QString filter() const { return m_filter; }
virtual void setFilter( const QString& pattern ) { m_filter = pattern; } virtual void setFilter( const QString& pattern ) { m_filter = pattern; }
virtual void reset() {}
QObject* object() const { return m_object; } QObject* object() const { return m_object; }
public slots: public slots:

7
src/sourcetree/sourcetreeview.cpp
View File

@@ -375,13 +375,6 @@ SourceTreeView::latchOff()
if( type != SourcesModel::Collection ) if( type != SourcesModel::Collection )
return; return;
PlaylistInterface* pi = AudioEngine::instance()->playlist();
if ( pi && dynamic_cast< SourcePlaylistInterface* >( pi ) )
{
SourcePlaylistInterface* sourcepi = dynamic_cast< SourcePlaylistInterface* >( pi );
sourcepi->reset();
}
AudioEngine::instance()->stop(); AudioEngine::instance()->stop();
AudioEngine::instance()->setPlaylist( 0 ); AudioEngine::instance()->setPlaylist( 0 );
} }