From 7742e3091af5b55c42ca7aeaf1a355b988b8b912 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Sun, 5 Jun 2011 13:55:53 -0400 Subject: [PATCH] show summary for songs as well --- .../playlist/dynamic/echonest/EchonestControl.cpp | 2 +- .../playlist/dynamic/echonest/EchonestGenerator.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp index bdd939a44..43a0d1555 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestControl.cpp @@ -643,7 +643,7 @@ Tomahawk::EchonestControl::calculateSummary() summary = QString( "similar to ~%1" ).arg( m_data.second.toString() ); } else if( selectedType() == "Artist Description" ) { summary = QString( "with genre ~%1" ).arg( m_data.second.toString() ); - } else if( selectedType() == "Artist Description" ) { + } else if( selectedType() == "Artist Description" || selectedType() == "Song" ) { summary = QString( "similar to ~%1" ).arg( m_data.second.toString() ); } else if( selectedType() == "Variety" || selectedType() == "Danceability" || selectedType() == "Artist Hotttnesss" || selectedType() == "Energy" || selectedType() == "Artist Familiarity" || selectedType() == "Song Hotttnesss" ) { QString modifier; diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp index ee55ae3a0..f4b8a5306 100644 --- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp +++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp @@ -445,10 +445,10 @@ EchonestGenerator::sentenceSummary() /// Skip empty artists QList< dyncontrol_ptr > empty; - foreach( const dyncontrol_ptr& artist, required ) { - QString summary = artist.dynamicCast< EchonestControl >()->summary(); + foreach( const dyncontrol_ptr& artistOrTrack, required ) { + QString summary = artistOrTrack.dynamicCast< EchonestControl >()->summary(); if( summary.lastIndexOf( "~" ) == summary.length() - 1 ) - empty << artist; + empty << artistOrTrack; } foreach( const dyncontrol_ptr& toremove, empty ) { required.removeAll( toremove );