mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-03 10:53:39 +02:00
Code Issues Releases Wiki Activity

* Properly add radio type to genre requests.

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2012-11-25 19:21:24 +01:00
parent 7f82cf6ea2
commit 897984f2a1
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,6 +212,7 @@ EchonestGenerator::startFromTrack( const Tomahawk::query_ptr& query )
data.second = query->artist() + " " + query->track(); data.second = query->artist() + " " + query->track();
Echonest::DynamicPlaylist::PlaylistParams params; Echonest::DynamicPlaylist::PlaylistParams params;
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) );
params << data; params << data;
// FIXME! // FIXME!
@@ -240,6 +241,7 @@ EchonestGenerator::startFromArtist( const Tomahawk::artist_ptr& artist )
Echonest::DynamicPlaylist::PlaylistParams params; Echonest::DynamicPlaylist::PlaylistParams params;
params << data; params << data;
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) );
emit paramsGenerated( params ); emit paramsGenerated( params );
return true; return true;
@@ -258,7 +260,9 @@ EchonestGenerator::startFromGenre( const QString& genre )
connect( deleteReply, SIGNAL( finished() ), deleteReply, SLOT( deleteLater() ) ); connect( deleteReply, SIGNAL( finished() ), deleteReply, SLOT( deleteLater() ) );
} }
connect( this, SIGNAL( paramsGenerated( Echonest::DynamicPlaylist::PlaylistParams ) ), this, SLOT( doStartOnDemand( Echonest::DynamicPlaylist::PlaylistParams ) ) ); connect( this, SIGNAL( paramsGenerated( Echonest::DynamicPlaylist::PlaylistParams ) ), this, SLOT( doGenerate( Echonest::DynamicPlaylist::PlaylistParams ) ) );
setProperty( "number", 20 );
Echonest::DynamicPlaylist::PlaylistParamData data; Echonest::DynamicPlaylist::PlaylistParamData data;
data.first = Echonest::DynamicPlaylist::Description; data.first = Echonest::DynamicPlaylist::Description;
@@ -266,6 +270,7 @@ EchonestGenerator::startFromGenre( const QString& genre )
Echonest::DynamicPlaylist::PlaylistParams params; Echonest::DynamicPlaylist::PlaylistParams params;
params << data; params << data;
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistDescriptionType ) );
emit paramsGenerated( params ); emit paramsGenerated( params );
return true; return true;
@@ -283,7 +288,7 @@ EchonestGenerator::doGenerate( const Echonest::DynamicPlaylist::PlaylistParams&
Echonest::DynamicPlaylist::PlaylistParams params = paramsIn; Echonest::DynamicPlaylist::PlaylistParams params = paramsIn;
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Results, number ) ); params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Results, number ) );
QNetworkReply* reply = Echonest::DynamicPlaylist::staticPlaylist( params ); QNetworkReply* reply = Echonest::DynamicPlaylist::staticPlaylist( params );
qDebug() << "Generating a static playlist from echonest!" << reply->url().toString(); tDebug() << "Generating a static playlist from echonest!" << reply->url().toString() << params;
connect( reply, SIGNAL( finished() ), this, SLOT( staticFinished() ) ); connect( reply, SIGNAL( finished() ), this, SLOT( staticFinished() ) );
} }
@@ -518,7 +523,7 @@ EchonestGenerator::appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& p
// else if( onlyThisArtistType( Echonest::DynamicPlaylist::ArtistRadioType ) ) // else if( onlyThisArtistType( Echonest::DynamicPlaylist::ArtistRadioType ) )
// params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) ); // params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistRadioType ) );
// else if( onlyThisArtistType( Echonest::DynamicPlaylist::SongRadioType ) ) // else if( onlyThisArtistType( Echonest::DynamicPlaylist::SongRadioType ) )
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) ); // params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) );
// else // no artist or song or description types. default to artist-description // else // no artist or song or description types. default to artist-description
// params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistDescriptionType ) ); // params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::ArtistDescriptionType ) );