Artist.h   Artist.h 
skipping to change at line 121 skipping to change at line 121
/** /**
* The following require fetching from The Echo Nest, so return a Q NetworkReply* * The following require fetching from The Echo Nest, so return a Q NetworkReply*
* that is ready for parsing when the finished() signal is emitted . * that is ready for parsing when the finished() signal is emitted .
* *
* Call parseProfile() on the Artist object to populate it with the result of the * Call parseProfile() on the Artist object to populate it with the result of the
* query. * query.
* *
*/ */
/** /**
* @Deprecated
* A list of audio files on the web for this artist. * A list of audio files on the web for this artist.
*/ */
AudioList audio() const; AudioList audio() const;
void setAudio( const AudioList& ); void setAudio( const AudioList& );
/** /**
* A list of biographies for this artist. * A list of biographies for this artist.
*/ */
BiographyList biographies() const; BiographyList biographies() const;
void setBiographies( const BiographyList& ); void setBiographies( const BiographyList& );
skipping to change at line 209 skipping to change at line 210
VideoList videos() const; VideoList videos() const;
void setVideos( const VideoList& ); void setVideos( const VideoList& );
/** /**
* The list of foreign ids for this artist, if fetched. * The list of foreign ids for this artist, if fetched.
*/ */
ForeignIds foreignIds() const; ForeignIds foreignIds() const;
void setForeignIds( const ForeignIds& ids ); void setForeignIds( const ForeignIds& ids );
/** /**
* @Deprecated
* Fetch a list of audio documents found on the web that are relate d to this artist. * Fetch a list of audio documents found on the web that are relate d to this artist.
* *
* @param numResults Limit how many results are returned * @param numResults Limit how many results are returned
* @param offset The offset of the results, if paging through resul ts in increments. * @param offset The offset of the results, if paging through resul ts in increments.
*/ */
QNetworkReply* fetchAudio( int numResults = 0, int offset = -1 ) co nst; QNetworkReply* fetchAudio( int numResults = 0, int offset = -1 ) co nst;
/** /**
* Fetch a list of biographies for this artist from various places on the web. * Fetch a list of biographies for this artist from various places on the web.
*/ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 AudioSummary.h   AudioSummary.h 
skipping to change at line 99 skipping to change at line 99
*/ */
qreal danceability() const; qreal danceability() const;
void setDanceability( qreal dance ); void setDanceability( qreal dance );
/** /**
* The energy of this song, from 0 to 1. * The energy of this song, from 0 to 1.
*/ */
qreal energy() const; qreal energy() const;
void setEnergy( qreal energy ); void setEnergy( qreal energy );
/**
* The acousticness of this song, from 0 to 1.
*/
qreal acousticness() const;
void setAcousticness( qreal acousticness );
/**
* The speechiness of this song, from 0 to 1.
*/
qreal speechiness() const;
void setSpeechiness( qreal speechiness );
/**
* The liveness of this song, from 0 to 1.
*/
qreal liveness() const;
void setLiveness( qreal liveness );
/**
* The valence of this song, from 0 to 1.
*/
qreal valence() const;
void setValence( qreal valence );
/// The following require additional fetching to read /// /// The following require additional fetching to read ///
/** TODO: implement **/ /** TODO: implement **/
/** /**
* If you wish to use any of the more detailed track analysis data, * If you wish to use any of the more detailed track analysis data,
* use this method to begin the fetch. One the returned QNetworkRe ply* * use this method to begin the fetch. One the returned QNetworkRe ply*
* has emitted the finished() signal, call parseFullAnalysis. * has emitted the finished() signal, call parseFullAnalysis.
*/ */
QNetworkReply* fetchFullAnalysis() const; QNetworkReply* fetchFullAnalysis() const;
 End of changes. 1 change blocks. 
0 lines changed or deleted 24 lines changed or added


 Playlist.h   Playlist.h 
skipping to change at line 99 skipping to change at line 99
SortLongitudeDescending, SortLongitudeDescending,
SortModeAscending, SortModeAscending,
SortModeDescending, SortModeDescending,
SortKeyAscending, SortKeyAscending,
SortKeyDescending, SortKeyDescending,
SortLoudnessAscending, SortLoudnessAscending,
SortLoudnessDescending, SortLoudnessDescending,
SortEnergyAscending, SortEnergyAscending,
SortEnergyDescending, SortEnergyDescending,
SortDanceabilityAscending, SortDanceabilityAscending,
SortDanceabilityDescending SortDanceabilityDescending,
SortAcousticnessAscending,
SortAcousticnessDescending,
SortSpeechinessAscending,
SortSpeechinessDescending,
SortLivenessAscending,
SortLivenessDescending,
SortValenceAscending,
SortValenceDescending
}; };
/** /**
* Different ways of picking artists in Artist radios. * Different ways of picking artists in Artist radios.
*/ */
enum ArtistPick { enum ArtistPick {
PickSongHotttnesssAscending, PickSongHotttnesssAscending,
PickTempoAscending, PickTempoAscending,
PickDurationAscending, PickDurationAscending,
PickLoudnessAscending, PickLoudnessAscending,
skipping to change at line 176 skipping to change at line 184
Adventurousness, /// A value of 0 means no adventurousness, onl y known and preferred music will be played. A value of 1 means high adventu rousness, mostly unknown music will be played. This parameter only applies to catalog and catalog-radio type playlists. Adventurousness, /// A value of 0 means no adventurousness, onl y known and preferred music will be played. A value of 1 means high adventu rousness, mostly unknown music will be played. This parameter only applies to catalog and catalog-radio type playlists.
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, Acous tic, Electric)
Genre, /// Genre Parameter needed for GenreRadio Playlist Genre, /// Genre Parameter needed for GenreRadio Playlist
ArtistStartYearBefore,
ArtistStartYearAfter,
ArtistEndYearBefore,
ArtistEndYearAfter,
MaxAcousticness, /// 0 < acousticness < 1 a measure of the max
imum acousticness of the song
MinAcousticness, /// 0 < acousticness < 1 a measure of the min
imum acousticness of the song
MaxSpeechiness, /// 0 < speechiness < 1 a measure of the maxim
um speechiness of the song
MinSpeechiness, /// 0 < speechiness < 1 a measure of the minim
um speechiness of the song
MaxLiveness, /// 0 < liveness < 1 a measure of the maximum liv
eness of the song
MinLiveness, /// 0 < liveness < 1 a measure of the minimum liv
eness of the song
MaxValence, /// 0 < valence < 1 a measure of the maximum valen
ce of the song
MinValence /// 0 < valence < 1 a measure of the minimum valenc
e of the song
}; };
/** /**
* 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. 3 change blocks. 
2 lines changed or deleted 30 lines changed or added


 Song.h   Song.h 
skipping to change at line 80 skipping to change at line 80
MinFamiliarity, MinFamiliarity,
MaxHotttnesss, MaxHotttnesss,
MinHotttnesss, MinHotttnesss,
MaxLongitude, MaxLongitude,
MinLongitude, MinLongitude,
MaxEnergy, MaxEnergy,
MinEnergy, MinEnergy,
Mode, Mode,
Key, Key,
Sort, Sort,
SongType SongType,
ArtistStartYearBefore,
ArtistStartYearAfter,
ArtistEndYearBefore,
ArtistEndYearAfter,
MaxAcousticness,
MinAcousticness,
MaxSpeechiness,
MinSpeechiness,
MaxLiveness,
MinLiveness,
MaxValence,
MinValence
}; };
typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData; typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData;
typedef QVector< SearchParamData > SearchParams; typedef QVector< SearchParamData > SearchParams;
enum IdentifyParam { enum IdentifyParam {
Code, Code,
IdentifyArtist, IdentifyArtist,
IdentifyTitle, IdentifyTitle,
IdentifyRelease, IdentifyRelease,
IdentifyDuration, IdentifyDuration,
 End of changes. 1 change blocks. 
1 lines changed or deleted 13 lines changed or added


 Util.h   Util.h 
skipping to change at line 127 skipping to change at line 127
QByteArray catalogTypeToLiteral( CatalogTypes::Type ); QByteArray catalogTypeToLiteral( CatalogTypes::Type );
CatalogTypes::Type literalToCatalogType( const QByteArray& type ); CatalogTypes::Type literalToCatalogType( const QByteArray& type );
QByteArray catalogStatusToLiteral( CatalogTypes::TicketStatus ); QByteArray catalogStatusToLiteral( CatalogTypes::TicketStatus );
CatalogTypes::TicketStatus literalToCatalogStatus( const QByteArray& ty pe ); CatalogTypes::TicketStatus literalToCatalogStatus( const QByteArray& ty pe );
QByteArray catalogUpdateActionToLiteral( CatalogTypes::Action ); QByteArray catalogUpdateActionToLiteral( CatalogTypes::Action );
CatalogTypes::Action literalToCatalogUpdateAction( const QByteArray& ty pe ); CatalogTypes::Action literalToCatalogUpdateAction( const QByteArray& ty pe );
void urlAddQueryItem( QUrl& url, const QString& key, const QString& val
ue );
void urlRemoveQueryItem( QUrl& url, const QString& key );
ECHONEST_EXPORT QDebug operator<<(QDebug d, const ForeignId& id); ECHONEST_EXPORT QDebug operator<<(QDebug d, const ForeignId& id);
ECHONEST_EXPORT QDebug operator<<(QDebug d, const ArtistLocation& id); ECHONEST_EXPORT QDebug operator<<(QDebug d, const ArtistLocation& id);
} }
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 4 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/