AudioSummary.h   AudioSummary.h 
skipping to change at line 87 skipping to change at line 87
qreal duration() const; qreal duration() const;
void setDuration( qreal duration ); void setDuration( qreal duration );
/** /**
* The loudness of the song, in dB. * The loudness of the song, in dB.
*/ */
qreal loudness() const; qreal loudness() const;
void setLoudness( qreal loudness ); void setLoudness( qreal loudness );
/** /**
* The danceability of this track, from 0 to 1.
*/
qreal danceability() const;
void setDanceability( qreal dance );
/**
* The energy of this song, from 0 to 1.
*/
qreal energy() const;
void setEnergy( qreal energy );
/// The following require additional fetching to read ///
/** 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;
/** /**
* Parses the result of a fetchFullAnalysis() call. This contains * Parses the result of a fetchFullAnalysis() call. This contains
* information such as mode, fadein/fadeout, confidence metrics, * information such as mode, fadein/fadeout, confidence metrics,
* and the division of the song into bars, beats, sections, and se gments. * and the division of the song into bars, beats, sections, and se gments.
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added


 Playlist.h   Playlist.h 
skipping to change at line 114 skipping to change at line 114
Artist, /// Artist names of seeds for playlist Artist, /// Artist names of seeds for playlist
SongId, /// IDs of seed songs for the playlist SongId, /// IDs of seed songs for the playlist
Description, /// Textual description for sort of songs that can be included in the playlist Description, /// Textual description for sort of songs that can be included in the playlist
Results, /// 0-100, how many sonsg to include in the playlist, default 15 Results, /// 0-100, how many sonsg to include in the playlist, default 15
MaxTempo, /// 0.0 < tempo < 500.0 (BPM) The maximum tempo for any included songs MaxTempo, /// 0.0 < tempo < 500.0 (BPM) The maximum tempo for any included songs
MinTempo, /// 0.0 < tempo < 500.0 (BPM) the minimum tempo for any included songs MinTempo, /// 0.0 < tempo < 500.0 (BPM) the minimum tempo for any included songs
MaxDuration, /// 0.0 < duration < 3600.0 (seconds) the ma ximum duration of any song on the playlist MaxDuration, /// 0.0 < duration < 3600.0 (seconds) the ma ximum duration of any song on the playlist
MinDuration, /// 0.0 < duration < 3600.0 (seconds) the mi nimum duration of any song on the playlist MinDuration, /// 0.0 < duration < 3600.0 (seconds) the mi nimum duration of any song on the playlist
MaxLoudness, /// -100.0 < loudness < 100.0 (dB) the maximum lo udness of any song on the playlist MaxLoudness, /// -100.0 < loudness < 100.0 (dB) the maximum lo udness of any song on the playlist
MinLoudness, /// -100.0 < loudness < 100.0 (dB) the minimum lo udness of any song on the playlist MinLoudness, /// -100.0 < loudness < 100.0 (dB) the minimum lo udness of any song on the playlist
MinDanceability, /// 0 < danceability < 1 a measure of the min
imum danceability of the song
MaxDanceability, /// 0 < danceability < 1 a measure of the max
imum danceability of the song
MinEnergy, /// 0 < danceability < 1 a measure of the maximum e
nergy of the song
MaxEnergy, /// 0 < danceability < 1 a measure of the maximum e
nergy of the song
ArtistMaxFamiliarity, /// 0.0 < familiarity < 1.0 the maximum artist familiarity for songs in the playlist ArtistMaxFamiliarity, /// 0.0 < familiarity < 1.0 the maximum artist familiarity for songs in the playlist
ArtistMinFamiliarity, /// 0.0 < familiarity < 1.0 the minimum artist familiarity for songs in the playlist ArtistMinFamiliarity, /// 0.0 < familiarity < 1.0 the minimum artist familiarity for songs in the playlist
ArtistMaxHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum h otttnesss for artists in the playlist ArtistMaxHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum h otttnesss for artists in the playlist
ArtistMinHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum h otttnesss for artists in the playlist ArtistMinHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum h otttnesss for artists in the playlist
SongMaxHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum hot ttnesss for songs in the playlist SongMaxHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum hot ttnesss for songs in the playlist
SongMinHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum hot ttnesss for songs in the playlist SongMinHotttnesss, /// 0.0 < hotttnesss < 1.0 the maximum hot ttnesss for songs in the playlist
ArtistMinLongitude, /// -180.0 < longitude < 180.0 the min imum longitude for the location of artists in the playlist ArtistMinLongitude, /// -180.0 < longitude < 180.0 the min imum longitude for the location of artists in the playlist
ArtistMaxLongitude, /// -180.0 < longitude < 180.0 the max imum longitude for the location of artists in the playlist ArtistMaxLongitude, /// -180.0 < longitude < 180.0 the max imum longitude for the location of artists in the playlist
ArtistMinLatitude, /// -90.0 < latitude < 90.0 the minimum lat itude for the location of artists in the playlist ArtistMinLatitude, /// -90.0 < latitude < 90.0 the minimum lat itude for the location of artists in the playlist
ArtistMaxLatitude, /// -90.0 < latitude < 90.0 the maximum lati tude for the location of artists in the playlist ArtistMaxLatitude, /// -90.0 < latitude < 90.0 the maximum lati tude for the location of artists in the playlist
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 Song.h   Song.h 
skipping to change at line 80 skipping to change at line 80
MaxDuration, MaxDuration,
MinDuration, MinDuration,
MaxLoudness, MaxLoudness,
MinLoudness, MinLoudness,
MaxFamiliarity, MaxFamiliarity,
MinFamiliarity, MinFamiliarity,
MaxHotttnesss, MaxHotttnesss,
MinHotttnesss, MinHotttnesss,
MaxLongitude, MaxLongitude,
MinLongitude, MinLongitude,
MaxEnergy,
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;
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 Song& other ); Song( const Song& other );
skipping to change at line 154 skipping to change at line 156
qreal artistFamiliarity() const; qreal artistFamiliarity() const;
void setArtistFamiliarity( qreal artistFamiliarity ); void setArtistFamiliarity( qreal artistFamiliarity );
/** /**
* The location of this artist. * The location of this artist.
*/ */
QString artistLocation() const; QString artistLocation() const;
void setArtistLocation( const QString& artistLocation ); void setArtistLocation( const QString& artistLocation );
/** /**
* This fetch the data from The Echo Nest for the requested data, so it * This fetches the data from The Echo Nest for the requested data, so i t
* returns a QNetworkReply*. When the finished() signal is emitted * returns a QNetworkReply*. When the finished() signal is emitted
* from the QNetworkReply object call parseInformation() to save the * from the QNetworkReply object call parseInformation() to save the
* data back to this Song object. * data back to this Song object.
* *
*/ */
QNetworkReply* fetchInformation( SongInformation parts ) const; QNetworkReply* fetchInformation( SongInformation parts ) const;
/** /**
* Search for a song from The Echo Nest with the given search parameters. See * Search for a song from The Echo Nest with the given search parameters. See
* 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
skipping to change at line 188 skipping to change at line 190
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 * Identify a song from a given Echo Nest fingerprint hash code
* *
* NOTE this is currently not supported, as the Echo Nest hash code * TODO
* generator is not currently open source, so I don't care much
* for it.
*
* static QNetworkReply* identify( ) const; * static QNetworkReply* identify( ) const;
*/ */
QString toString() const; QString toString() const;
friend class DynamicPlaylist; friend class DynamicPlaylist;
private: private:
static QByteArray searchParamToString( SearchParam param ); static QByteArray searchParamToString( SearchParam param );
static void addQueryInformation( QUrl& url, SongInformation parts ); static void addQueryInformation( QUrl& url, SongInformation parts );
 End of changes. 3 change blocks. 
5 lines changed or deleted 4 lines changed or added


 echonest_export.h   echonest_export.h 
skipping to change at line 20 skipping to change at line 20
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR A * * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNES S FOR A *
* PARTICULAR PURPOSE. See the GNU General Public License for more details. * * PARTICULAR PURPOSE. See the GNU General Public License for more details. *
* * * *
* You should have received a copy of the GNU General Public License along with * * You should have received a copy of the GNU General Public License along with *
* this program. If not, see <http://www.gnu.org/licenses/>. * * this program. If not, see <http://www.gnu.org/licenses/>. *
************************************************************************** **************/ ************************************************************************** **************/
#ifndef ECHONEST_EXPORT_H #ifndef ECHONEST_EXPORT_H
#define ECHONEST_EXPORT_H #define ECHONEST_EXPORT_H
#ifdef Q_CC_MSVC #ifdef _WIN32
#define ECHONEST_EXPORT __declspec(dllimport) #define ECHONEST_EXPORT __declspec(dllexport)
#elif __GNUC__ >= 4 #elif __GNUC__ >= 4
#define ECHONEST_EXPORT __attribute__ ((visibility("default"))) #define ECHONEST_EXPORT __attribute__ ((visibility("default")))
#else #else
#define ECHONEST_EXPORT #define ECHONEST_EXPORT
#endif #endif
#endif #endif
 End of changes. 1 change blocks. 
2 lines changed or deleted 2 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/