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

* Fixed resetting the active playlist.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-02-27 16:05:23 +01:00
parent 8945577fcd
commit 38b0519b1a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libtomahawk/audio/audioengine.h
View File

@@ -32,7 +32,8 @@ public:
unsigned int volume() const { if ( m_audio ) return m_audio->volume() * 100.0; else return 0; }; // in percent unsigned int volume() const { if ( m_audio ) return m_audio->volume() * 100.0; else return 0; }; // in percent
bool isPaused() const { return m_audio->isPaused(); } bool isPaused() const { return m_audio->isPaused(); }
bool isPlaying() const { return m_audio->isPlaying(); }
/* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */ /* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */
PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist; } PlaylistInterface* currentTrackPlaylist() const { return m_currentTrackPlaylist; }

2
src/libtomahawk/playlist/playlistmanager.cpp
View File

@@ -525,7 +525,7 @@ PlaylistManager::setPage( ViewPage* page, bool trackHistory )
if ( !currentPlaylistInterface() ) if ( !currentPlaylistInterface() )
emit tempPageActivated(); emit tempPageActivated();
if ( !AudioEngine::instance()->playlist() ) if ( !AudioEngine::instance()->isPlaying() )
AudioEngine::instance()->setPlaylist( currentPlaylistInterface() ); AudioEngine::instance()->setPlaylist( currentPlaylistInterface() );
m_stack->setCurrentWidget( page->widget() ); m_stack->setCurrentWidget( page->widget() );

3
src/libtomahawk/playlist/playlistmanager.h
View File

@@ -103,8 +103,6 @@ public slots:
void showQueue(); void showQueue();
void hideQueue(); void hideQueue();
void setFilter( const QString& filter );
void setRepeatMode( PlaylistInterface::RepeatMode mode ); void setRepeatMode( PlaylistInterface::RepeatMode mode );
void setShuffled( bool enabled ); void setShuffled( bool enabled );
@@ -117,6 +115,7 @@ public slots:
void onPauseClicked(); void onPauseClicked();
private slots: private slots:
void setFilter( const QString& filter );
void applyFilter(); void applyFilter();
void onWidgetDestroyed( QWidget* widget ); void onWidgetDestroyed( QWidget* widget );