[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] bbc5f68: fix scrobbling after composer patch. Composer obje
From:       Leo Franchi <lfranchi () kde ! org>
Date:       2010-10-20 20:16:41
Message-ID: 20101020201641.E2251A6095 () git ! kde ! org
[Download RAW message or body]

commit bbc5f68c40b4dcc5cbd6371468e11856576b7d66
branch master
Author: Leo Franchi <lfranchi@kde.org>
Date:   Wed Oct 20 16:16:16 2010 -0400

    fix scrobbling after composer patch. Composer object is non-null but name is null \
often.

diff --git a/src/services/lastfm/ScrobblerAdapter.cpp \
b/src/services/lastfm/ScrobblerAdapter.cpp index 8a546b6..d5c4afc 100644
--- a/src/services/lastfm/ScrobblerAdapter.cpp
+++ b/src/services/lastfm/ScrobblerAdapter.cpp
@@ -77,9 +77,10 @@ ScrobblerAdapter::engineNewTrackPlaying()
         
         m_current.setTitle( track->name() );
         m_current.setDuration( track->length() / 1000 );
-        if( track->artist() || track->composer() )
-            m_current.setArtist(
-                track->composer() ? track->composer()->name() : \
track->artist()->name() ); +        if( track->composer() && \
!track->composer()->name().isEmpty() ) +            m_current.setArtist( \
track->composer()->name() ); +        else if( track->artist() )
+            m_current.setArtist( track->artist()->name() );
         if( track->album() )
             m_current.setAlbum( track->album()->name() );
 
@@ -133,7 +134,10 @@ ScrobblerAdapter::engineNewMetaData( const QHash<qint64, \
QString> &newMetaData,  resetVariables();
                     
         m_current.setTitle( track->name() );
-        m_current.setArtist( track->composer() ? track->composer()->name() : \
track->artist()->name() ); +        if( track->composer() && \
!track->composer()->name().isEmpty() ) +            m_current.setArtist( \
track->composer()->name() ); +        else if( track->artist() )
+            m_current.setArtist( track->artist()->name() );
         m_current.stamp();
         
         m_current.setSource( lastfm::Track::NonPersonalisedBroadcast );
@@ -211,8 +215,10 @@ ScrobblerAdapter::loveTrack( Meta::TrackPtr track ) // slot
     {
         lastfm::MutableTrack trackInfo;
         trackInfo.setTitle( track->name() );
-        if( track->artist() || track->composer() )
-            trackInfo.setArtist( track->composer() ? track->composer()->name() : \
track->artist()->name() ); +        if( track->composer() && \
!track->composer()->name().isEmpty() ) +            m_current.setArtist( \
track->composer()->name() ); +        else if( track->artist() )
+            m_current.setArtist( track->artist()->name() );
         if( track->album() )
             trackInfo.setAlbum( track->album()->name() );
 


[prev in list] [next in list] [prev in thread] [next in thread]