Artist.h   Artist.h 
skipping to change at line 340 skipping to change at line 340
* *
* \param results How many results to return, between 0 and 15. Def ault is 10 * \param results How many results to return, between 0 and 15. Def ault is 10
*/ */
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 = "style" ); static QNetworkReply* listTerms( const QString& type = QLatin1Strin g("style") );
/** /**
* 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.
*/ */
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 Song.h   Song.h 
skipping to change at line 84 skipping to change at line 84
MinLongitude, MinLongitude,
MaxEnergy, MaxEnergy,
MinEnergy, MinEnergy,
Mode, Mode,
Key, Key,
Sort, Sort,
}; };
typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData; typedef QPair< Echonest::Song::SearchParam, QVariant > SearchParamData;
typedef QVector< SearchParamData > SearchParams; typedef QVector< SearchParamData > SearchParams;
enum IdentifyParam {
Code,
IdentifyArtist,
IdentifyTitle,
IdentifyRelease,
IdentifyDuration,
IdentifyGenre
};
typedef QPair< Echonest::Song::IdentifyParam, QVariant > IdentifyParamDat
a;
typedef QVector< IdentifyParamData > IdentifyParams;
Song(); Song();
Song( const QByteArray& id, const QString& title, const QByteArray& artis tId, const QString& artistName ); Song( const QByteArray& id, const QString& title, const QByteArray& artis tId, const QString& artistName );
Song( const QByteArray& id ); Song( const QByteArray& id );
Song( const Song& other ); Song( const Song& other );
Song& operator=(const Song& song); Song& operator=(const Song& song);
virtual ~Song(); virtual ~Song();
/** /**
* The following pieces of data are present in all Song objects, and do n ot require * The following pieces of data are present in all Song objects, and do n ot require
* on-demand fetching. * on-demand fetching.
skipping to change at line 181 skipping to change at line 192
* http://developer.echonest.com/docs/v4/song.html#search for a descript ion of the * http://developer.echonest.com/docs/v4/song.html#search for a descript ion of the
* parameters and data types. * parameters and data types.
* *
* The result will contain the requested information from the SongInforma tion flags, and * The result will contain the requested information from the SongInforma tion flags, and
* can be extracted in the parseSearch() function. * can be extracted in the parseSearch() function.
* *
*/ */
static QNetworkReply* search( const SearchParams& params, SongInformation information = SongInformation() ); static QNetworkReply* search( const SearchParams& params, SongInformation information = SongInformation() );
/** /**
* Identify a song from a given Echo Nest fingerprint hash code.
* NOTE: SongInformation is currently not parsed yet.
*
*/
static QNetworkReply* identify( const IdentifyParams& params, const SongI
nformation& information = SongInformation() );
/**
* Identify a song from the Echoprint hash code, this time using the outp
ut of the 'echoprint-codegen' command-line
* tool
*/
// static QNetworkReply* identify( const QByteArray& jsonData );
/**
* Parses the reply of the identify call and returns a list of songs foun
d.
*
*/
static QVector< Song > parseIdentify( QNetworkReply* ) throw( ParseError
);
/**
* Parse the result of the fetchInformation() call. * Parse the result of the fetchInformation() call.
* For each requested SongInformationFlag in the original request, the re spective * For each requested SongInformationFlag in the original request, the re spective
* data will be saved to this Song object. * data will be saved to this Song object.
*/ */
void parseInformation( QNetworkReply* reply ) throw( ParseError ); void parseInformation( QNetworkReply* reply ) throw( ParseError );
/** /**
* Parse the result of the search() call. * Parse the result of the search() call.
*/ */
static QVector<Song> parseSearch( QNetworkReply* reply ) throw( ParseErro r ); static QVector<Song> parseSearch( QNetworkReply* reply ) throw( ParseErro r );
/**
* Identify a song from a given Echo Nest fingerprint hash code
*
* TODO
* static QNetworkReply* identify( ) const;
*/
QString toString() const; QString toString() const;
friend class DynamicPlaylist; friend class DynamicPlaylist;
friend class Catalog; // for access to searchParamToString friend class Catalog; // for access to searchParamToString
private: private:
static QByteArray searchParamToString( SearchParam param ); static QByteArray searchParamToString( SearchParam param );
static QByteArray identifyParamToString( IdentifyParam param );
static void addQueryInformation( QUrl& url, SongInformation information ); static void addQueryInformation( QUrl& url, SongInformation information );
QSharedDataPointer<SongData> d; QSharedDataPointer<SongData> d;
}; };
typedef QVector< Song > SongList; typedef QVector< Song > SongList;
ECHONEST_EXPORT QDebug operator<<(QDebug d, const Song &song); ECHONEST_EXPORT QDebug operator<<(QDebug d, const Song &song);
}; // namespace }; // namespace
 End of changes. 4 change blocks. 
7 lines changed or deleted 36 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/