Artist.h   Artist.h 
skipping to change at line 343 skipping to change at line 343
static QNetworkReply* suggest( const QString& name, int results = 1 0 ); static QNetworkReply* suggest( const QString& name, int results = 1 0 );
/** /**
* Returns a list of terms of the given type, for use in other call s. * Returns a list of terms of the given type, for use in other call s.
* *
* \param type Which type of term to return, at the moment only 'st yle' or 'mood' * \param type Which type of term to return, at the moment only 'st yle' or 'mood'
*/ */
static QNetworkReply* listTerms( const QString& type = QLatin1Strin g("style") ); static QNetworkReply* listTerms( const QString& type = QLatin1Strin g("style") );
/** /**
* Fetch a list of genres supported by echonest
*/
static QNetworkReply* fetchGenres();
/**
* Parse the result of a fetchSimilar() call, which returns a list of artists similar to the * Parse the result of a fetchSimilar() call, which returns a list of artists similar to the
* original pair. * original pair.
*/ */
static Artists parseSimilar( QNetworkReply* ) throw( ParseError ); static Artists parseSimilar( QNetworkReply* ) throw( ParseError );
/** /**
* Parse the result of an artist search. * Parse the result of an artist search.
*/ */
static Artists parseSearch( QNetworkReply* ) throw( ParseError ); static Artists parseSearch( QNetworkReply* ) throw( ParseError );
skipping to change at line 371 skipping to change at line 376
static TermList parseTopTerms( QNetworkReply* ) throw( ParseError ) ; static TermList parseTopTerms( QNetworkReply* ) throw( ParseError ) ;
/** /**
* Parse the result of a suggest query * Parse the result of a suggest query
* *
* Returns a list of suggested artists * Returns a list of suggested artists
*/ */
static Artists parseSuggest( QNetworkReply* ) throw( ParseError ); static Artists parseSuggest( QNetworkReply* ) throw( ParseError );
/** /**
* Parse the result of a termList query. Returns the list of values returned. * Parse the result of a termList query. Returns the list of terms delivered.
*/ */
static QVector< QString > parseTermList( QNetworkReply* ) throw( Pa rseError ); static QVector< QString > parseTermList( QNetworkReply* ) throw( Pa rseError );
/**
* Parse the result of a genres query. Returns the list of genres d
elivered.
*/
static QVector< QString > parseGenreList( QNetworkReply* ) throw (
ParseError );
private: private:
QUrl setupQuery( const QByteArray& methodName, int numResults = 0, int start = -1 ) const; QUrl setupQuery( const QByteArray& methodName, int numResults = 0, int start = -1 ) const;
static QByteArray searchParamToString( SearchParam param ); static QByteArray searchParamToString( SearchParam param );
static void addQueryInformation( QUrl& url, ArtistInformation infor mation ); static void addQueryInformation( QUrl& url, ArtistInformation infor mation );
QSharedDataPointer<ArtistData> d; QSharedDataPointer<ArtistData> d;
friend class Catalog; friend class Catalog;
}; };
 End of changes. 3 change blocks. 
1 lines changed or deleted 13 lines changed or added


 Playlist.h   Playlist.h 
skipping to change at line 68 skipping to change at line 68
* The types of playlist that can be generated. Artist plays songs for the given artist, * The types of playlist that can be generated. Artist plays songs for the given artist,
* ArtistRadio takes into account similar artists, and ArtistDescr iption plays songs matching * ArtistRadio takes into account similar artists, and ArtistDescr iption plays songs matching
* the given description. * the given description.
*/ */
enum ArtistTypeEnum { enum ArtistTypeEnum {
ArtistType, ArtistType,
ArtistRadioType, ArtistRadioType,
ArtistDescriptionType, ArtistDescriptionType,
CatalogType, CatalogType,
CatalogRadioType, CatalogRadioType,
SongRadioType SongRadioType,
GenreRadioType
}; };
/** /**
* Different ways to sort a generated playlist * Different ways to sort a generated playlist
*/ */
enum SortingType { enum SortingType {
SortTempoAscending, SortTempoAscending,
SortTempoDescending, SortTempoDescending,
SortDurationAscending, SortDurationAscending,
SortDurationDescending, SortDurationDescending,
skipping to change at line 176 skipping to change at line 177
MoreLikeThis, /// When steering: Supply a song id to steer this session towards. Can be boosted from 0-5 like so: SO12341234^2. Default is 1 MoreLikeThis, /// When steering: Supply a song id to steer this session towards. Can be boosted from 0-5 like so: SO12341234^2. Default is 1
LessLikeThis, /// When steering: Supply a song id to steer this session away from. Can be boosted from 0-5 like so: SO12341234^2. Default is 1 LessLikeThis, /// When steering: Supply a song id to steer this session away from. Can be boosted from 0-5 like so: SO12341234^2. Default is 1
TargetTempo, /// When steering: 0.0 < tempo < 500. (BPM). Targe t a desired tempo for the songs in this dynamic playlist session TargetTempo, /// When steering: 0.0 < tempo < 500. (BPM). Targe t a desired tempo for the songs in this dynamic playlist session
TargetLoudness, /// When steering: -100. < loudness < 100. (BPM )dB. Target a desired loudness for the songs in this dynamic playlist sessi on TargetLoudness, /// When steering: -100. < loudness < 100. (BPM )dB. Target a desired loudness for the songs in this dynamic playlist sessi on
TargetDanceability, /// When steering: 0.0 < danceability < 1. Target a desired danceability for the songs in this dynamic playlist sessio n TargetDanceability, /// When steering: 0.0 < danceability < 1. Target a desired danceability for the songs in this dynamic playlist sessio n
TargetEnergy, /// When steering: 0.0 < energy < 1.Target a desi red energy for the songs in this dynamic playlist session TargetEnergy, /// When steering: 0.0 < energy < 1.Target a desi red energy for the songs in this dynamic playlist session
TargetSongHotttnesss, /// When steering: 0.0 < song_hotttnesss < 1.Target a desired song_hotttnesss for the songs in this dynamic playlist session TargetSongHotttnesss, /// When steering: 0.0 < song_hotttnesss < 1.Target a desired song_hotttnesss for the songs in this dynamic playlist session
TargetArtistHotttnesss, /// When steering: 0.0 < artist_hottttn esss < 1.Target a desired artist_hottttnesss for the songs in this dynamic playlist session TargetArtistHotttnesss, /// When steering: 0.0 < artist_hottttn esss < 1.Target a desired artist_hottttnesss for the songs in this dynamic playlist session
TargetArtistFamiliarity, /// When steering: 0.0 < artist_famili arity < 1.Target a desired energy for the artist_familiarity in this dynami c playlist session TargetArtistFamiliarity, /// When steering: 0.0 < artist_famili arity < 1.Target a desired energy for the artist_familiarity in this dynami c playlist session
SongType, /// Type of Song (atm: Live, Studio, Christmas) SongType, /// Type of Song (atm: Live, Studio, Christmas)
Genre, /// Genre Parameter needed for GenreRadio Playlist
}; };
/** /**
* The types of feedback that can be used to steer a dynamic playli st * The types of feedback that can be used to steer a dynamic playli st
*/ */
enum DynamicFeedbackParam { enum DynamicFeedbackParam {
BanArtist, /// Ban this artist from this dynamic session. [arti st_id, track_id, song_id, "last"] BanArtist, /// Ban this artist from this dynamic session. [arti st_id, track_id, song_id, "last"]
FavoriteArtist, /// Mark this artist as 'liked' for this sessio n. [artist_id, track_id, song_id, "last"] FavoriteArtist, /// Mark this artist as 'liked' for this sessio n. [artist_id, track_id, song_id, "last"]
BanSong, /// Ban this song from this dynamic session. [track_id , song_id, "last"] BanSong, /// Ban this song from this dynamic session. [track_id , song_id, "last"]
SkipSong, /// Mark this song as skipped by the user. Will not a ppear for the rest of the session. [track_id, song_id, "last"] SkipSong, /// Mark this song as skipped by the user. Will not a ppear for the rest of the session. [track_id, song_id, "last"]
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/