* Improved behaviour: If you click AudioControl's track title, it will jump back to the currently playing playlist (in case you switched to a different playlist / collection in the meantime).

* A few cleanups in AudioEngine & AudioControls.

src/audio/audioengine.cpp

@@ -268,6 +268,7 @@ AudioEngine::playItem( PlaylistInterface* playlist, const Tomahawk::result_ptr&
     qDebug() << Q_FUNC_INFO;
 
     m_playlist = playlist;
+    m_currentPlaylist = playlist;
     loadTrack( result );
 }
 

src/audio/audioengine.h

@@ -28,19 +28,11 @@ public:
 
     unsigned int volume() { if ( m_audio ) return m_audio->volume() * 100.0; else return 0; }; // in percent
 
-signals:
+    /* Returns the PlaylistInterface of the currently playing track. Note: This might be different to the current playlist! */
-    void loading( const Tomahawk::result_ptr& track );
+    PlaylistInterface* currentPlaylist() const { return m_currentPlaylist; }
-    void started( const Tomahawk::result_ptr& track );
-    void stopped();
-    void paused();
-    void resumed();
 
-    void volumeChanged( int volume /* in percent */ );
+    /* Returns the PlaylistInterface of the current playlist. Note: The currently playing track might still be from a different playlist! */
-
+    PlaylistInterface* playlist() const { return m_playlist; }
-    void timerSeconds( unsigned int secondsElapsed );
-    void timerPercentage( unsigned int percentage );
-
-    void error( AudioErrorCode errorCode );
 
 public slots:
     void play();
@@ -60,6 +52,20 @@ public slots:
 
     void onTrackAboutToClose();
 
+signals:
+    void loading( const Tomahawk::result_ptr& track );
+    void started( const Tomahawk::result_ptr& track );
+    void stopped();
+    void paused();
+    void resumed();
+
+    void volumeChanged( int volume /* in percent */ );
+
+    void timerSeconds( unsigned int secondsElapsed );
+    void timerPercentage( unsigned int percentage );
+
+    void error( AudioErrorCode errorCode );
+
 private slots:
     bool loadTrack( const Tomahawk::result_ptr& result );
     void loadPreviousTrack();
@@ -86,6 +92,7 @@ private:
     Tomahawk::result_ptr m_currentTrack;
     Tomahawk::result_ptr m_lastTrack;
     PlaylistInterface* m_playlist;
+    PlaylistInterface* m_currentPlaylist;
     QMutex m_mutex;
 
     int m_i;

src/audiocontrols.cpp

@@ -194,7 +194,7 @@ AudioControls::onCoverArtDownloaded()
     }
     else
     {
-//        qDebug() << "Following redirect to" << redir.toString();
+        // Follow HTTP redirect
         QNetworkRequest req( redir );
         QNetworkReply* reply = APP->nam()->get( req );
         connect( reply, SIGNAL( finished() ), SLOT( onCoverArtDownloaded() ) );
@@ -231,7 +231,7 @@ AudioControls::onPlaybackLoading( const Tomahawk::result_ptr& result )
     ui->coverImage->setPixmap( m_defaultCover );
 
     if ( ui->timeLabel->text().isEmpty() )
-        ui->timeLabel->setText( "00:00" );
+        ui->timeLabel->setText( TomahawkUtils::timeToString( 0 ) );
 
     if ( ui->timeLeftLabel->text().isEmpty() )
         ui->timeLeftLabel->setText( "-" + TomahawkUtils::timeToString( result->duration() ) );

src/playlist/playlistmanager.cpp

@@ -269,6 +269,30 @@ PlaylistManager::setShuffled( bool enabled )
 void
 PlaylistManager::showCurrentTrack()
 {
+    bool found = false;
+
+    foreach ( const QList<PlaylistView*>& pv, m_views.values() )
+    {
+        if ( APP->audioEngine()->currentPlaylist() == pv.first()->proxyModel() )
+        {
+            Tomahawk::playlist_ptr pptr = m_views.key( pv );
+            show( pptr );
+            found = true;
+        }
+    }
+
+    if ( !found )
+    {
+        foreach ( const QList<CollectionView*>& pv, m_collectionViews.values() )
+        {
+            if ( APP->audioEngine()->currentPlaylist() == pv.first()->proxyModel() )
+            {
+                Tomahawk::collection_ptr cptr = m_collectionViews.key( pv );
+                show( cptr );
+            }
+        }
+    }
+
     if ( m_currentView && m_currentProxyModel )
         m_currentView->scrollTo( m_currentProxyModel->currentItem(), QAbstractItemView::PositionAtCenter );
 }

src/sourcetree/sourcetreeview.cpp

@@ -162,14 +162,6 @@ SourceTreeView::onItemActivated( const QModelIndex& index )
 void
 SourceTreeView::onSelectionChanged()
 {
-/*    QModelIndexList si = selectedIndexes();
-
-    foreach( const QModelIndex& idx, si )
-    {
-        int type = SourcesModel::indexType( idx );
-        if ( type == 0 )
-            selectionModel()->select( idx, QItemSelectionModel::Deselect );
-    }*/
 }