From 611ca21ec6a2dbe04f4a0e8abc38c4b4fce1148d Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Fri, 20 Jul 2012 13:01:46 -0400
Subject: [PATCH] Remove steering from echonest stations

---
 .../dynamic/echonest/EchonestGenerator.cpp    | 43 -------------------
 .../dynamic/echonest/EchonestGenerator.h      | 13 +-----
 2 files changed, 2 insertions(+), 54 deletions(-)

diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
index 1f3fd0cff..fdd640d38 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
@@ -121,7 +121,6 @@ CatalogManager::catalogs() const
 EchonestGenerator::EchonestGenerator ( QObject* parent )
     : GeneratorInterface ( parent )
     , m_dynPlaylist( new Echonest::DynamicPlaylist() )
-    , m_steeredSinceLastTrack( false )
 {
     m_type = "echonest";
     m_mode = OnDemand;
@@ -401,33 +400,6 @@ EchonestGenerator::dynamicFetched()
 }
 
 
-void
-EchonestGenerator::steerDescription( const QString& desc )
-{
-    m_steeredSinceLastTrack = true;
-    m_steerData.first = Echonest::DynamicPlaylist::SteerDescription;
-    m_steerData.second = desc;
-}
-
-
-void
-EchonestGenerator::steerField( const QString& field )
-{
-    m_steeredSinceLastTrack = true;
-    m_steerData.first = Echonest::DynamicPlaylist::Steer;
-    m_steerData.second = field;
-}
-
-
-void
-EchonestGenerator::resetSteering()
-{
-    m_steeredSinceLastTrack = false;
-    m_steerData.first = Echonest::DynamicPlaylist::Steer;
-    m_steerData.second = QString();
-}
-
-
 QByteArray
 EchonestGenerator::catalogId(const QString &collectionId)
 {
@@ -507,21 +479,6 @@ EchonestGenerator::queryFromSong( const Echonest::Song& song )
 }
 
 
-QWidget*
-EchonestGenerator::steeringWidget()
-{
-    if( m_steerer.isNull() ) {
-        m_steerer = QWeakPointer< EchonestSteerer >( new EchonestSteerer );
-
-        connect( m_steerer.data(), SIGNAL( steerField( QString ) ), this, SLOT( steerField( QString ) ) );
-        connect( m_steerer.data(), SIGNAL( steerDescription( QString ) ), this, SLOT( steerDescription( QString ) ) );
-        connect( m_steerer.data(), SIGNAL( reset() ), this, SLOT( resetSteering() ) );
-    }
-
-    return m_steerer.data();
-}
-
-
 QString
 EchonestGenerator::sentenceSummary()
 {
diff --git a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
index 90cb7c338..993ea1766 100644
--- a/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
+++ b/src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
@@ -77,8 +77,8 @@ public:
     virtual void startOnDemand();
     virtual void fetchNext( int rating = -1 );
     virtual QString sentenceSummary();
-    virtual bool onDemandSteerable() const { return true; }
-    virtual QWidget* steeringWidget();
+    virtual bool onDemandSteerable() const { return false; }
+    virtual QWidget* steeringWidget() { return 0; }
 
     static QStringList styles();
     static QStringList moods();
@@ -94,11 +94,6 @@ private slots:
     void dynamicStarted();
     void dynamicFetched();
 
-    // steering controls
-    void steerField( const QString& field );
-    void steerDescription( const QString& desc );
-    void resetSteering();
-
     void doGenerate( const Echonest::DynamicPlaylist::PlaylistParams& params );
     void doStartOnDemand( const Echonest::DynamicPlaylist::PlaylistParams& params );
 
@@ -131,10 +126,6 @@ private:
     // used for the intermediary song id lookup
     QSet< QNetworkReply* > m_waiting;
     Echonest::DynamicPlaylist::PlaylistParams m_storedParams;
-
-    QWeakPointer<EchonestSteerer> m_steerer;
-    bool m_steeredSinceLastTrack;
-    Echonest::DynamicPlaylist::DynamicControl m_steerData;
 };
 
 };