mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 11:20:22 +02:00
Code Issues Releases Wiki Activity

If no artist or description or song is specified, default to song-radio.

Browse Source 
This makes a bunch of stations/playlists with mood/style only work
This commit is contained in:
Leo Franchi
2011-05-24 08:08:50 -04:00
parent 0b80cd65bd
commit 456e57cf20
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,6 +226,12 @@ EchonestGenerator::getParams() throw( std::runtime_error )
connect( r, SIGNAL( finished() ), this, SLOT( songLookupFinished() ) ); connect( r, SIGNAL( finished() ), this, SLOT( songLookupFinished() ) );
} }
} }
if( m_waiting.isEmpty() ) {
m_storedParams.clear();
emit paramsGenerated( params );
}
} else { } else {
emit paramsGenerated( params ); emit paramsGenerated( params );
} }
@@ -376,6 +382,8 @@ EchonestGenerator::appendRadioType( Echonest::DynamicPlaylist::PlaylistParams& p
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 song-radio
params.append( Echonest::DynamicPlaylist::PlaylistParamData( Echonest::DynamicPlaylist::Type, Echonest::DynamicPlaylist::SongRadioType ) );
return static_cast< Echonest::DynamicPlaylist::ArtistTypeEnum >( params.last().second.toInt() ); return static_cast< Echonest::DynamicPlaylist::ArtistTypeEnum >( params.last().second.toInt() );
} }