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

Remove steering from echonest stations

Browse Source
This commit is contained in:
Leo Franchi
2012-07-20 13:01:46 -04:00
parent 64274d6d39
commit 611ca21ec6
2 changed files with 2 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.cpp
View File

@@ -121,7 +121,6 @@ CatalogManager::catalogs() const
EchonestGenerator::EchonestGenerator ( QObject* parent ) EchonestGenerator::EchonestGenerator ( QObject* parent )
: GeneratorInterface ( parent ) : GeneratorInterface ( parent )
, m_dynPlaylist( new Echonest::DynamicPlaylist() ) , m_dynPlaylist( new Echonest::DynamicPlaylist() )
, m_steeredSinceLastTrack( false )
{ {
m_type = "echonest"; m_type = "echonest";
m_mode = OnDemand; 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 QByteArray
EchonestGenerator::catalogId(const QString &collectionId) 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 QString
EchonestGenerator::sentenceSummary() EchonestGenerator::sentenceSummary()
{ {

13
src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h
View File

@@ -77,8 +77,8 @@ public:
virtual void startOnDemand(); virtual void startOnDemand();
virtual void fetchNext( int rating = -1 ); virtual void fetchNext( int rating = -1 );
virtual QString sentenceSummary(); virtual QString sentenceSummary();
virtual bool onDemandSteerable() const { return true; } virtual bool onDemandSteerable() const { return false; }
virtual QWidget* steeringWidget(); virtual QWidget* steeringWidget() { return 0; }
static QStringList styles(); static QStringList styles();
static QStringList moods(); static QStringList moods();
@@ -94,11 +94,6 @@ private slots:
void dynamicStarted(); void dynamicStarted();
void dynamicFetched(); void dynamicFetched();
// steering controls
void steerField( const QString& field );
void steerDescription( const QString& desc );
void resetSteering();
void doGenerate( const Echonest::DynamicPlaylist::PlaylistParams& params ); void doGenerate( const Echonest::DynamicPlaylist::PlaylistParams& params );
void doStartOnDemand( const Echonest::DynamicPlaylist::PlaylistParams& params ); void doStartOnDemand( const Echonest::DynamicPlaylist::PlaylistParams& params );
@@ -131,10 +126,6 @@ private:
// used for the intermediary song id lookup // used for the intermediary song id lookup
QSet< QNetworkReply* > m_waiting; QSet< QNetworkReply* > m_waiting;
Echonest::DynamicPlaylist::PlaylistParams m_storedParams; Echonest::DynamicPlaylist::PlaylistParams m_storedParams;
QWeakPointer<EchonestSteerer> m_steerer;
bool m_steeredSinceLastTrack;
Echonest::DynamicPlaylist::DynamicControl m_steerData;
}; };
}; };