spotify 12.0.2 → 12.0.3

data/CHANGELOG.md

@@ -2,6 +2,10 @@ __v12.1.0__
 -----------
 - erroneously released (wrong version number, does not follow version policy)
 
+[v12.0.3][]
+-----------
+- add support for search_playlist (retrieves a playlist object directly from a search)
+
 [v12.0.2][]
 -----------
 - use error checking in Spotify::Pointer add_ref and release
@@ -122,6 +126,7 @@ v0.0.0
 ------
 - release to register rubygems.org name
 
+[v12.0.3]: https://github.com/Burgestrand/libspotify-ruby/compare/v12.0.2...v12.0.3
 [v12.0.2]: https://github.com/Burgestrand/libspotify-ruby/compare/v12.0.1...v12.0.2
 [v12.0.1]: https://github.com/Burgestrand/libspotify-ruby/compare/v12.0.0...v12.0.1
 [v12.0.0]: https://github.com/Burgestrand/libspotify-ruby/compare/v11.0.2...v12.0.0

data/Rakefile

@@ -18,5 +18,9 @@ task :gen do
   sh 'gccxml spec/api.h -fxml=spec/api.h.xml'
 end
 
+task :console do
+  exec "irb", "-Ilib", "-rspotify"
+end
+
 task :spec => :test
 task :default => :test

data/lib/spotify/functions.rb

@@ -509,6 +509,7 @@ module Spotify
   attach_function :search_num_artists, :sp_search_num_artists, [ :search ], :int
   attach_function :search_artist, :sp_search_artist, [ :search, :int ], :artist
   attach_function :search_num_playlists, :sp_search_num_playlists, [ :search ], :int
+  attach_function :search_playlist, :sp_search_playlist, [ :search, :int ], :playlist
   attach_function :search_playlist_name, :sp_search_playlist_name, [ :search, :int ], :utf8_string
   attach_function :search_playlist_uri, :sp_search_playlist_uri, [ :search, :int ], :utf8_string
   attach_function :search_playlist_image_uri, :sp_search_playlist_image_uri, [ :search, :int ], :utf8_string

data/lib/spotify/gc_wrappers.rb

@@ -81,6 +81,7 @@ module Spotify
   wrap_function :search_track, :track
   wrap_function :search_album, :album
   wrap_function :search_artist, :artist
+  wrap_function :search_playlist, :playlist
 
   wrap_function :playlist_track, :track
   wrap_function :playlist_track_creator, :user

data/lib/spotify/version.rb

@@ -1,4 +1,4 @@
 module Spotify
   # See README for versioning policy.
-  VERSION = [12, 0, 2].join('.')
+  VERSION = [12, 0, 3].join('.')
 end

data/spec/api.h

@@ -93,42 +93,42 @@ typedef struct sp_inbox sp_inbox; ///< Add to inbox request handle
  * Error codes returned by various functions
  */
 typedef enum sp_error {
-	SP_ERROR_OK                        = 0,  ///< No errors encountered
-	SP_ERROR_BAD_API_VERSION           = 1,  ///< The library version targeted does not match the one you claim you support
-	SP_ERROR_API_INITIALIZATION_FAILED = 2,  ///< Initialization of library failed - are cache locations etc. valid?
-	SP_ERROR_TRACK_NOT_PLAYABLE        = 3,  ///< The track specified for playing cannot be played
-	SP_ERROR_BAD_APPLICATION_KEY       = 5,  ///< The application key is invalid
-	SP_ERROR_BAD_USERNAME_OR_PASSWORD  = 6,  ///< Login failed because of bad username and/or password
-	SP_ERROR_USER_BANNED               = 7,  ///< The specified username is banned
-	SP_ERROR_UNABLE_TO_CONTACT_SERVER  = 8,  ///< Cannot connect to the Spotify backend system
-	SP_ERROR_CLIENT_TOO_OLD            = 9,  ///< Client is too old, library will need to be updated
-	SP_ERROR_OTHER_PERMANENT           = 10, ///< Some other error occurred, and it is permanent (e.g. trying to relogin will not help)
-	SP_ERROR_BAD_USER_AGENT            = 11, ///< The user agent string is invalid or too long
-	SP_ERROR_MISSING_CALLBACK          = 12, ///< No valid callback registered to handle events
-	SP_ERROR_INVALID_INDATA            = 13, ///< Input data was either missing or invalid
-	SP_ERROR_INDEX_OUT_OF_RANGE        = 14, ///< Index out of range
-	SP_ERROR_USER_NEEDS_PREMIUM        = 15, ///< The specified user needs a premium account
-	SP_ERROR_OTHER_TRANSIENT           = 16, ///< A transient error occurred.
-	SP_ERROR_IS_LOADING                = 17, ///< The resource is currently loading
-	SP_ERROR_NO_STREAM_AVAILABLE       = 18, ///< Could not find any suitable stream to play
-	SP_ERROR_PERMISSION_DENIED         = 19, ///< Requested operation is not allowed
-	SP_ERROR_INBOX_IS_FULL             = 20, ///< Target inbox is full
-	SP_ERROR_NO_CACHE                  = 21, ///< Cache is not enabled
-	SP_ERROR_NO_SUCH_USER              = 22, ///< Requested user does not exist
-	SP_ERROR_NO_CREDENTIALS            = 23, ///< No credentials are stored
-	SP_ERROR_NETWORK_DISABLED          = 24, ///< Network disabled
-	SP_ERROR_INVALID_DEVICE_ID         = 25, ///< Invalid device ID
-	SP_ERROR_CANT_OPEN_TRACE_FILE      = 26, ///< Unable to open trace file
-	SP_ERROR_APPLICATION_BANNED        = 27, ///< This application is no longer allowed to use the Spotify service
-	SP_ERROR_OFFLINE_TOO_MANY_TRACKS   = 31, ///< Reached the device limit for number of tracks to download
-	SP_ERROR_OFFLINE_DISK_CACHE        = 32, ///< Disk cache is full so no more tracks can be downloaded to offline mode
-	SP_ERROR_OFFLINE_EXPIRED           = 33, ///< Offline key has expired, the user needs to go online again
-	SP_ERROR_OFFLINE_NOT_ALLOWED       = 34, ///< This user is not allowed to use offline mode
-	SP_ERROR_OFFLINE_LICENSE_LOST      = 35, ///< The license for this device has been lost. Most likely because the user used offline on three other device
-	SP_ERROR_OFFLINE_LICENSE_ERROR     = 36, ///< The Spotify license server does not respond correctly
-	SP_ERROR_LASTFM_AUTH_ERROR         = 39, ///< A LastFM scrobble authentication error has occurred
-	SP_ERROR_INVALID_ARGUMENT          = 40, ///< An invalid argument was specified
-	SP_ERROR_SYSTEM_FAILURE            = 41, ///< An operating system error
+  SP_ERROR_OK                        = 0,  ///< No errors encountered
+  SP_ERROR_BAD_API_VERSION           = 1,  ///< The library version targeted does not match the one you claim you support
+  SP_ERROR_API_INITIALIZATION_FAILED = 2,  ///< Initialization of library failed - are cache locations etc. valid?
+  SP_ERROR_TRACK_NOT_PLAYABLE        = 3,  ///< The track specified for playing cannot be played
+  SP_ERROR_BAD_APPLICATION_KEY       = 5,  ///< The application key is invalid
+  SP_ERROR_BAD_USERNAME_OR_PASSWORD  = 6,  ///< Login failed because of bad username and/or password
+  SP_ERROR_USER_BANNED               = 7,  ///< The specified username is banned
+  SP_ERROR_UNABLE_TO_CONTACT_SERVER  = 8,  ///< Cannot connect to the Spotify backend system
+  SP_ERROR_CLIENT_TOO_OLD            = 9,  ///< Client is too old, library will need to be updated
+  SP_ERROR_OTHER_PERMANENT           = 10, ///< Some other error occurred, and it is permanent (e.g. trying to relogin will not help)
+  SP_ERROR_BAD_USER_AGENT            = 11, ///< The user agent string is invalid or too long
+  SP_ERROR_MISSING_CALLBACK          = 12, ///< No valid callback registered to handle events
+  SP_ERROR_INVALID_INDATA            = 13, ///< Input data was either missing or invalid
+  SP_ERROR_INDEX_OUT_OF_RANGE        = 14, ///< Index out of range
+  SP_ERROR_USER_NEEDS_PREMIUM        = 15, ///< The specified user needs a premium account
+  SP_ERROR_OTHER_TRANSIENT           = 16, ///< A transient error occurred.
+  SP_ERROR_IS_LOADING                = 17, ///< The resource is currently loading
+  SP_ERROR_NO_STREAM_AVAILABLE       = 18, ///< Could not find any suitable stream to play
+  SP_ERROR_PERMISSION_DENIED         = 19, ///< Requested operation is not allowed
+  SP_ERROR_INBOX_IS_FULL             = 20, ///< Target inbox is full
+  SP_ERROR_NO_CACHE                  = 21, ///< Cache is not enabled
+  SP_ERROR_NO_SUCH_USER              = 22, ///< Requested user does not exist
+  SP_ERROR_NO_CREDENTIALS            = 23, ///< No credentials are stored
+  SP_ERROR_NETWORK_DISABLED          = 24, ///< Network disabled
+  SP_ERROR_INVALID_DEVICE_ID         = 25, ///< Invalid device ID
+  SP_ERROR_CANT_OPEN_TRACE_FILE      = 26, ///< Unable to open trace file
+  SP_ERROR_APPLICATION_BANNED        = 27, ///< This application is no longer allowed to use the Spotify service
+  SP_ERROR_OFFLINE_TOO_MANY_TRACKS   = 31, ///< Reached the device limit for number of tracks to download
+  SP_ERROR_OFFLINE_DISK_CACHE        = 32, ///< Disk cache is full so no more tracks can be downloaded to offline mode
+  SP_ERROR_OFFLINE_EXPIRED           = 33, ///< Offline key has expired, the user needs to go online again
+  SP_ERROR_OFFLINE_NOT_ALLOWED       = 34, ///< This user is not allowed to use offline mode
+  SP_ERROR_OFFLINE_LICENSE_LOST      = 35, ///< The license for this device has been lost. Most likely because the user used offline on three other device
+  SP_ERROR_OFFLINE_LICENSE_ERROR     = 36, ///< The Spotify license server does not respond correctly
+  SP_ERROR_LASTFM_AUTH_ERROR         = 39, ///< A LastFM scrobble authentication error has occurred
+  SP_ERROR_INVALID_ARGUMENT          = 40, ///< An invalid argument was specified
+  SP_ERROR_SYSTEM_FAILURE            = 41, ///< An operating system error
 } sp_error;
 
 /**
@@ -168,11 +168,11 @@ SP_LIBEXPORT(const char*) sp_error_message(sp_error error);
  * Describes the current state of the connection
  */
 typedef enum sp_connectionstate {
-	SP_CONNECTION_STATE_LOGGED_OUT   = 0, ///< User not yet logged in
-	SP_CONNECTION_STATE_LOGGED_IN    = 1, ///< Logged in against a Spotify access point
-	SP_CONNECTION_STATE_DISCONNECTED = 2, ///< Was logged in, but has now been disconnected
-	SP_CONNECTION_STATE_UNDEFINED    = 3, ///< The connection state is undefined
-	SP_CONNECTION_STATE_OFFLINE		 = 4  ///< Logged in in offline mode
+  SP_CONNECTION_STATE_LOGGED_OUT   = 0, ///< User not yet logged in
+  SP_CONNECTION_STATE_LOGGED_IN    = 1, ///< Logged in against a Spotify access point
+  SP_CONNECTION_STATE_DISCONNECTED = 2, ///< Was logged in, but has now been disconnected
+  SP_CONNECTION_STATE_UNDEFINED    = 3, ///< The connection state is undefined
+  SP_CONNECTION_STATE_OFFLINE    = 4  ///< Logged in in offline mode
 } sp_connectionstate;
 
 
@@ -180,16 +180,16 @@ typedef enum sp_connectionstate {
  * Sample type descriptor
  */
 typedef enum sp_sampletype {
-	SP_SAMPLETYPE_INT16_NATIVE_ENDIAN = 0, ///< 16-bit signed integer samples
+  SP_SAMPLETYPE_INT16_NATIVE_ENDIAN = 0, ///< 16-bit signed integer samples
 } sp_sampletype;
 
 /**
  * Audio format descriptor
  */
 typedef struct sp_audioformat {
-	sp_sampletype sample_type;   ///< Sample type enum,
-	int sample_rate;             ///< Audio sample rate, in samples per second.
-	int channels;                ///< Number of channels. Currently 1 or 2.
+  sp_sampletype sample_type;   ///< Sample type enum,
+  int sample_rate;             ///< Audio sample rate, in samples per second.
+  int channels;                ///< Number of channels. Currently 1 or 2.
 } sp_audioformat;
 
 /**
@@ -205,10 +205,10 @@ typedef enum sp_bitrate {
  * Playlist types
  */
 typedef enum sp_playlist_type {
-	SP_PLAYLIST_TYPE_PLAYLIST     = 0, ///< A normal playlist.
-	SP_PLAYLIST_TYPE_START_FOLDER = 1, ///< Marks a folder starting point,
-	SP_PLAYLIST_TYPE_END_FOLDER   = 2, ///< and ending point.
-	SP_PLAYLIST_TYPE_PLACEHOLDER  = 3, ///< Unknown entry.
+  SP_PLAYLIST_TYPE_PLAYLIST     = 0, ///< A normal playlist.
+  SP_PLAYLIST_TYPE_START_FOLDER = 1, ///< Marks a folder starting point,
+  SP_PLAYLIST_TYPE_END_FOLDER   = 2, ///< and ending point.
+  SP_PLAYLIST_TYPE_PLACEHOLDER  = 3, ///< Unknown entry.
 } sp_playlist_type;
 
 
@@ -217,67 +217,67 @@ typedef enum sp_playlist_type {
  * Search types
  */
 typedef enum sp_search_type {
-	SP_SEARCH_STANDARD  = 0,
-	SP_SEARCH_SUGGEST = 1,
+  SP_SEARCH_STANDARD  = 0,
+  SP_SEARCH_SUGGEST = 1,
 } sp_search_type;
 
 /**
  * Playlist offline status
  */
 typedef enum sp_playlist_offline_status {
-	SP_PLAYLIST_OFFLINE_STATUS_NO          = 0, ///< Playlist is not offline enabled
-	SP_PLAYLIST_OFFLINE_STATUS_YES         = 1, ///< Playlist is synchronized to local storage
-	SP_PLAYLIST_OFFLINE_STATUS_DOWNLOADING = 2, ///< This playlist is currently downloading. Only one playlist can be in this state any given time
-	SP_PLAYLIST_OFFLINE_STATUS_WAITING     = 3, ///< Playlist is queued for download
+  SP_PLAYLIST_OFFLINE_STATUS_NO          = 0, ///< Playlist is not offline enabled
+  SP_PLAYLIST_OFFLINE_STATUS_YES         = 1, ///< Playlist is synchronized to local storage
+  SP_PLAYLIST_OFFLINE_STATUS_DOWNLOADING = 2, ///< This playlist is currently downloading. Only one playlist can be in this state any given time
+  SP_PLAYLIST_OFFLINE_STATUS_WAITING     = 3, ///< Playlist is queued for download
 } sp_playlist_offline_status;
 
 /**
  * Track availability
  */
 typedef enum sp_availability {
-	SP_TRACK_AVAILABILITY_UNAVAILABLE = 0, ///< Track is not available
-	SP_TRACK_AVAILABILITY_AVAILABLE   = 1, ///< Track is available and can be played
-	SP_TRACK_AVAILABILITY_NOT_STREAMABLE = 2, ///< Track can not be streamed using this account
-	SP_TRACK_AVAILABILITY_BANNED_BY_ARTIST = 3, ///< Track not available on artist's reqeust
+  SP_TRACK_AVAILABILITY_UNAVAILABLE = 0, ///< Track is not available
+  SP_TRACK_AVAILABILITY_AVAILABLE   = 1, ///< Track is available and can be played
+  SP_TRACK_AVAILABILITY_NOT_STREAMABLE = 2, ///< Track can not be streamed using this account
+  SP_TRACK_AVAILABILITY_BANNED_BY_ARTIST = 3, ///< Track not available on artist's reqeust
 } sp_track_availability;
 
 /**
  * Track offline status
  */
 typedef enum sp_track_offline_status {
-	SP_TRACK_OFFLINE_NO             = 0, ///< Not marked for offline
-	SP_TRACK_OFFLINE_WAITING        = 1, ///< Waiting for download
-	SP_TRACK_OFFLINE_DOWNLOADING    = 2, ///< Currently downloading
-	SP_TRACK_OFFLINE_DONE           = 3, ///< Downloaded OK and can be played
-	SP_TRACK_OFFLINE_ERROR          = 4, ///< Error during download
-	SP_TRACK_OFFLINE_DONE_EXPIRED   = 5, ///< Downloaded OK but not playable due to expiery
-	SP_TRACK_OFFLINE_LIMIT_EXCEEDED = 6, ///< Waiting because device have reached max number of allowed tracks
-	SP_TRACK_OFFLINE_DONE_RESYNC    = 7, ///< Downloaded OK and available but scheduled for re-download
+  SP_TRACK_OFFLINE_NO             = 0, ///< Not marked for offline
+  SP_TRACK_OFFLINE_WAITING        = 1, ///< Waiting for download
+  SP_TRACK_OFFLINE_DOWNLOADING    = 2, ///< Currently downloading
+  SP_TRACK_OFFLINE_DONE           = 3, ///< Downloaded OK and can be played
+  SP_TRACK_OFFLINE_ERROR          = 4, ///< Error during download
+  SP_TRACK_OFFLINE_DONE_EXPIRED   = 5, ///< Downloaded OK but not playable due to expiery
+  SP_TRACK_OFFLINE_LIMIT_EXCEEDED = 6, ///< Waiting because device have reached max number of allowed tracks
+  SP_TRACK_OFFLINE_DONE_RESYNC    = 7, ///< Downloaded OK and available but scheduled for re-download
 } sp_track_offline_status;
 
 /**
  * Image size
  */
 typedef enum sp_image_size {
-	SP_IMAGE_SIZE_NORMAL                  = 0, ///< Normal image size
-	SP_IMAGE_SIZE_SMALL                   = 1, ///< Small image size
-	SP_IMAGE_SIZE_LARGE                   = 2, ///< Large image size
+  SP_IMAGE_SIZE_NORMAL                  = 0, ///< Normal image size
+  SP_IMAGE_SIZE_SMALL                   = 1, ///< Small image size
+  SP_IMAGE_SIZE_LARGE                   = 2, ///< Large image size
 } sp_image_size;
 
 /**
  * Buffer stats used by get_audio_buffer_stats callback
  */
 typedef struct sp_audio_buffer_stats {
-	int samples;                      ///< Samples in buffer
-	int stutter;                      ///< Number of stutters (audio dropouts) since last query
+  int samples;                      ///< Samples in buffer
+  int stutter;                      ///< Number of stutters (audio dropouts) since last query
 } sp_audio_buffer_stats;
 
 /**
  * List of subscribers returned by sp_playlist_subscribers()
  */
 typedef struct sp_subscribers {
-	unsigned int count;    ///< Number of elements in 'subscribers'
-	char *subscribers[1];  ///< Actual size is 'count'. Array of pointers to canonical usernames
+  unsigned int count;    ///< Number of elements in 'subscribers'
+  char *subscribers[1];  ///< Actual size is 'count'. Array of pointers to canonical usernames
 } sp_subscribers;
 
 
@@ -285,12 +285,12 @@ typedef struct sp_subscribers {
  * Current connection type set using sp_session_set_connection_type()
  */
 typedef enum sp_connection_type {
-	SP_CONNECTION_TYPE_UNKNOWN        = 0, ///< Connection type unknown (Default)
-	SP_CONNECTION_TYPE_NONE           = 1, ///< No connection
-	SP_CONNECTION_TYPE_MOBILE         = 2, ///< Mobile data (EDGE, 3G, etc)
-	SP_CONNECTION_TYPE_MOBILE_ROAMING = 3, ///< Roamed mobile data (EDGE, 3G, etc)
-	SP_CONNECTION_TYPE_WIFI           = 4, ///< Wireless connection
-	SP_CONNECTION_TYPE_WIRED          = 5, ///< Ethernet cable, etc
+  SP_CONNECTION_TYPE_UNKNOWN        = 0, ///< Connection type unknown (Default)
+  SP_CONNECTION_TYPE_NONE           = 1, ///< No connection
+  SP_CONNECTION_TYPE_MOBILE         = 2, ///< Mobile data (EDGE, 3G, etc)
+  SP_CONNECTION_TYPE_MOBILE_ROAMING = 3, ///< Roamed mobile data (EDGE, 3G, etc)
+  SP_CONNECTION_TYPE_WIFI           = 4, ///< Wireless connection
+  SP_CONNECTION_TYPE_WIRED          = 5, ///< Ethernet cable, etc
 } sp_connection_type;
 
 
@@ -300,10 +300,10 @@ typedef enum sp_connection_type {
  * The default is SP_CONNECTION_RULE_NETWORK | SP_CONNECTION_RULE_ALLOW_SYNC
  */
 typedef enum sp_connection_rules {
-	SP_CONNECTION_RULE_NETWORK                = 0x1, ///< Allow network traffic. When not set libspotify will force itself into offline mode
-	SP_CONNECTION_RULE_NETWORK_IF_ROAMING     = 0x2, ///< Allow network traffic even if roaming
-	SP_CONNECTION_RULE_ALLOW_SYNC_OVER_MOBILE = 0x4, ///< Set to allow syncing of offline content over mobile connections
-	SP_CONNECTION_RULE_ALLOW_SYNC_OVER_WIFI   = 0x8, ///< Set to allow syncing of offline content over WiFi
+  SP_CONNECTION_RULE_NETWORK                = 0x1, ///< Allow network traffic. When not set libspotify will force itself into offline mode
+  SP_CONNECTION_RULE_NETWORK_IF_ROAMING     = 0x2, ///< Allow network traffic even if roaming
+  SP_CONNECTION_RULE_ALLOW_SYNC_OVER_MOBILE = 0x4, ///< Set to allow syncing of offline content over mobile connections
+  SP_CONNECTION_RULE_ALLOW_SYNC_OVER_WIFI   = 0x8, ///< Set to allow syncing of offline content over WiFi
 } sp_connection_rules;
 
 
@@ -311,17 +311,17 @@ typedef enum sp_connection_rules {
  * Controls the type of data that will be included in artist browse queries
  */
 typedef enum sp_artistbrowse_type {
-	SP_ARTISTBROWSE_FULL,         /**< All information except tophit tracks
-				           This mode is deprecated and will removed in a future release */
-	SP_ARTISTBROWSE_NO_TRACKS,    /**< Only albums and data about them, no tracks.
-					   In other words, sp_artistbrowse_num_tracks() will return 0
-				      */
-	SP_ARTISTBROWSE_NO_ALBUMS,    /**< Only return data about the artist (artist name, similar artist
-					   biography, etc
-					   No tracks or album will be abailable.
-					   sp_artistbrowse_num_tracks() and sp_artistbrowse_num_albums()
-					   will both return 0
-				      */
+  SP_ARTISTBROWSE_FULL,         /**< All information except tophit tracks
+                   This mode is deprecated and will removed in a future release */
+  SP_ARTISTBROWSE_NO_TRACKS,    /**< Only albums and data about them, no tracks.
+             In other words, sp_artistbrowse_num_tracks() will return 0
+              */
+  SP_ARTISTBROWSE_NO_ALBUMS,    /**< Only return data about the artist (artist name, similar artist
+             biography, etc
+             No tracks or album will be abailable.
+             sp_artistbrowse_num_tracks() and sp_artistbrowse_num_albums()
+             will both return 0
+              */
 } sp_artistbrowse_type;
 
 typedef enum sp_social_provider {
@@ -343,43 +343,43 @@ typedef enum sp_scrobbling_state {
  * Offline sync status
  */
 typedef struct sp_offline_sync_status {
-	/**
-	 * Queued tracks/bytes is things left to sync in current sync
-	 * operation
-	 */
-	int queued_tracks;
-	sp_uint64 queued_bytes;
-	
-	/**
-	 * Done tracks/bytes is things marked for sync that existed on
-	 * device before current sync operation
-	 */
-	int done_tracks;
-	sp_uint64 done_bytes;
-	
-	/**
-	 * Copied tracks/bytes is things that has been copied in
-	 * current sync operation
-	 */
-	int copied_tracks;
-	sp_uint64 copied_bytes;
-
-	/**
-	 * Tracks that are marked as synced but will not be copied
-	 * (for various reasons)
-	 */
-	int willnotcopy_tracks;
-
-	/**
-	 * A track is counted as error when something goes wrong while
-	 * syncing the track
-	 */
-	int error_tracks;
-
-	/**
-	 * Set if sync operation is in progress
-	 */
-	bool syncing;
+  /**
+   * Queued tracks/bytes is things left to sync in current sync
+   * operation
+   */
+  int queued_tracks;
+  sp_uint64 queued_bytes;
+
+  /**
+   * Done tracks/bytes is things marked for sync that existed on
+   * device before current sync operation
+   */
+  int done_tracks;
+  sp_uint64 done_bytes;
+
+  /**
+   * Copied tracks/bytes is things that has been copied in
+   * current sync operation
+   */
+  int copied_tracks;
+  sp_uint64 copied_bytes;
+
+  /**
+   * Tracks that are marked as synced but will not be copied
+   * (for various reasons)
+   */
+  int willnotcopy_tracks;
+
+  /**
+   * A track is counted as error when something goes wrong while
+   * syncing the track
+   */
+  int error_tracks;
+
+  /**
+   * Set if sync operation is in progress
+   */
+  bool syncing;
 
 } sp_offline_sync_status;
 
@@ -392,319 +392,319 @@ typedef struct sp_offline_sync_status {
  */
 typedef struct sp_session_callbacks {
 
-	/**
-	 * Called when login has been processed and was successful
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  error      One of the following errors, from ::sp_error
-	 *                        SP_ERROR_OK
-	 *                        SP_ERROR_CLIENT_TOO_OLD
-	 *                        SP_ERROR_UNABLE_TO_CONTACT_SERVER
-	 *                        SP_ERROR_BAD_USERNAME_OR_PASSWORD
-	 *                        SP_ERROR_USER_BANNED
-	 *                        SP_ERROR_USER_NEEDS_PREMIUM
-	 *                        SP_ERROR_OTHER_TRANSIENT
-	 *                        SP_ERROR_OTHER_PERMANENT
-	 */
-	void (SP_CALLCONV *logged_in)(sp_session *session, sp_error error);
-
-	/**
-	 * Called when logout has been processed. Either called explicitly
-	 * if you initialize a logout operation, or implicitly if there
-	 * is a permanent connection error
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *logged_out)(sp_session *session);
-	/**
-	 * Called whenever metadata has been updated
-	 *
-	 * If you have metadata cached outside of libspotify, you should purge
-	 * your caches and fetch new versions.
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *metadata_updated)(sp_session *session);
-
-	/**
-	 * Called when there is a connection error, and the library has problems
-	 * reconnecting to the Spotify service. Could be called multiple times (as
-	 * long as the problem is present)
-	 *
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  error      One of the following errors, from ::sp_error
-	 *                        SP_ERROR_OK
-	 *                        SP_ERROR_CLIENT_TOO_OLD
-	 *                        SP_ERROR_UNABLE_TO_CONTACT_SERVER
-	 *                        SP_ERROR_BAD_USERNAME_OR_PASSWORD
-	 *                        SP_ERROR_USER_BANNED
-	 *                        SP_ERROR_USER_NEEDS_PREMIUM
-	 *                        SP_ERROR_OTHER_TRANSIENT
-	 *                        SP_ERROR_OTHER_PERMANENT
-	 */
-	void (SP_CALLCONV *connection_error)(sp_session *session, sp_error error);
-
-	/**
-	 * Called when the access point wants to display a message to the user
-	 *
-	 * In the desktop client, these are shown in a blueish toolbar just below the
-	 * search box.
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  message    String in UTF-8 format.
-	 */
-	void (SP_CALLCONV *message_to_user)(sp_session *session, const char *message);
-
-	/**
-	 * Called when processing needs to take place on the main thread.
-	 *
-	 * You need to call sp_session_process_events() in the main thread to get
-	 * libspotify to do more work. Failure to do so may cause request timeouts,
-	 * or a lost connection.
-	 *
-	 * @param[in]  session    Session
-	 *
-	 * @note This function is called from an internal session thread - you need to have proper synchronization!
-	 */
-	void (SP_CALLCONV *notify_main_thread)(sp_session *session);
-
-	/**
-	 * Called when there is decompressed audio data available.
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  format     Audio format descriptor sp_audioformat
-	 * @param[in]  frames     Points to raw PCM data as described by \p format
-	 * @param[in]  num_frames Number of available samples in \p frames.
-	 *                        If this is 0, a discontinuity has occurred (such as after a seek). The application
-	 *                        should flush its audio fifos, etc.
-	 *
-	 * @return                Number of frames consumed.
-	 *                        This value can be used to rate limit the output from the library if your
-	 *                        output buffers are saturated. The library will retry delivery in about 100ms.
-	 *
-	 * @note This function is called from an internal session thread - you need to have proper synchronization!
-	 *
-	 * @note This function must never block. If your output buffers are full you must return 0 to signal
-	 *       that the library should retry delivery in a short while.
-	 */
-	int (SP_CALLCONV *music_delivery)(sp_session *session, const sp_audioformat *format, const void *frames, int num_frames);
-
-	/**
-	 * Music has been paused because an account only allows music
-	 * to be played from one location simultaneously.
-	 *
-	 * @note When this callback is invoked the application should
-	 *       behave just as if the user pressed the pause
-	 *       button. The application should also display a message
-	 *       to the user indicating the playback has been paused
-	 *       because another application is playing using the same
-	 *       account.
-	 *
-	 * @note IT MUST NOT automatically resume playback but must
-	 *       instead wait for the user to press play.
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *play_token_lost)(sp_session *session);
-
-	/**
-	 * Logging callback.
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  data       Log data
-	 */
-	void (SP_CALLCONV *log_message)(sp_session *session, const char *data);
-
-	/**
-	 * End of track.
-	 * Called when the currently played track has reached its end.
-	 *
-	 * @note This function is invoked from the main thread
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *end_of_track)(sp_session *session);
-
-	/**
-	 * Streaming error.
-	 * Called when streaming cannot start or continue.
-	 *
-	 * @note This function is invoked from the main thread
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  error      One of the following errors, from ::sp_error
-	 *                        SP_ERROR_NO_STREAM_AVAILABLE
-	 *                        SP_ERROR_OTHER_TRANSIENT
-	 *                        SP_ERROR_OTHER_PERMANENT
-	 */
-	void (SP_CALLCONV *streaming_error)(sp_session *session, sp_error error);
-
-	/**
-	 * Called after user info (anything related to sp_user objects) have been updated.
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *userinfo_updated)(sp_session *session);
-
-	/**
-	 * Called when audio playback should start
-	 *
-	 * @note For this to work correctly the application must also implement get_audio_buffer_stats()
-	 *
-	 * @note This function is called from an internal session thread - you need to have proper synchronization!
-	 *
-	 * @note This function must never block.
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *start_playback)(sp_session *session);
-
-
-	/**
-	 * Called when audio playback should stop
-	 *
-	 * @note For this to work correctly the application must also implement get_audio_buffer_stats()
-	 *
-	 * @note This function is called from an internal session thread - you need to have proper synchronization!
-	 *
-	 * @note This function must never block.
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *stop_playback)(sp_session *session);
-
-	/**
-	 * Called to query application about its audio buffer
-	 *
-	 * @note This function is called from an internal session thread - you need to have proper synchronization!
-	 *
-	 * @note This function must never block.
-	 *
-	 * @param[in]  session    Session
-	 * @param[out] stats      Stats struct to be filled by application
-	 */
-	void (SP_CALLCONV *get_audio_buffer_stats)(sp_session *session, sp_audio_buffer_stats *stats);
-
-	/**
-	 * Called when offline synchronization status is updated
-	 *
-	 * @param[in]  session    Session
-	 */
-	void (SP_CALLCONV *offline_status_updated)(sp_session *session);
-
-	/**
-	 * Called when offline synchronization status is updated
-	 *
-	 * @param[in]  session    Session
-	 * @param[in]  error      Offline error. Will be SP_ERROR_OK if the offline synchronization
-	 *                        error state has cleared
-	 */
-	void (SP_CALLCONV *offline_error)(sp_session *session, sp_error error);
-
-	/**
-	 * Called when storable credentials have been updated, usually called when
-	 * we have connected to the AP. 
-	 *
-	 * @param[in]  session	  Session
-	 * @param[in]  blob	  Blob is a null-terminated string which contains
-	 *			  an encrypted token that can be stored safely on disk
-	 *			  instead of storing plaintext passwords.
-	 */
-	void (SP_CALLCONV *credentials_blob_updated)(sp_session *session, const char *blob);
-
-	/**
-	 * Called when the connection state has updated - such as when logging in, going offline, etc. 
-	 *
-	 * @param[in]  session	  Session
-	 */
-	void (SP_CALLCONV *connectionstate_updated)(sp_session *session);
+  /**
+   * Called when login has been processed and was successful
+   *
+   * @param[in]  session    Session
+   * @param[in]  error      One of the following errors, from ::sp_error
+   *                        SP_ERROR_OK
+   *                        SP_ERROR_CLIENT_TOO_OLD
+   *                        SP_ERROR_UNABLE_TO_CONTACT_SERVER
+   *                        SP_ERROR_BAD_USERNAME_OR_PASSWORD
+   *                        SP_ERROR_USER_BANNED
+   *                        SP_ERROR_USER_NEEDS_PREMIUM
+   *                        SP_ERROR_OTHER_TRANSIENT
+   *                        SP_ERROR_OTHER_PERMANENT
+   */
+  void (SP_CALLCONV *logged_in)(sp_session *session, sp_error error);
+
+  /**
+   * Called when logout has been processed. Either called explicitly
+   * if you initialize a logout operation, or implicitly if there
+   * is a permanent connection error
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *logged_out)(sp_session *session);
+  /**
+   * Called whenever metadata has been updated
+   *
+   * If you have metadata cached outside of libspotify, you should purge
+   * your caches and fetch new versions.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *metadata_updated)(sp_session *session);
+
+  /**
+   * Called when there is a connection error, and the library has problems
+   * reconnecting to the Spotify service. Could be called multiple times (as
+   * long as the problem is present)
+   *
+   *
+   * @param[in]  session    Session
+   * @param[in]  error      One of the following errors, from ::sp_error
+   *                        SP_ERROR_OK
+   *                        SP_ERROR_CLIENT_TOO_OLD
+   *                        SP_ERROR_UNABLE_TO_CONTACT_SERVER
+   *                        SP_ERROR_BAD_USERNAME_OR_PASSWORD
+   *                        SP_ERROR_USER_BANNED
+   *                        SP_ERROR_USER_NEEDS_PREMIUM
+   *                        SP_ERROR_OTHER_TRANSIENT
+   *                        SP_ERROR_OTHER_PERMANENT
+   */
+  void (SP_CALLCONV *connection_error)(sp_session *session, sp_error error);
+
+  /**
+   * Called when the access point wants to display a message to the user
+   *
+   * In the desktop client, these are shown in a blueish toolbar just below the
+   * search box.
+   *
+   * @param[in]  session    Session
+   * @param[in]  message    String in UTF-8 format.
+   */
+  void (SP_CALLCONV *message_to_user)(sp_session *session, const char *message);
+
+  /**
+   * Called when processing needs to take place on the main thread.
+   *
+   * You need to call sp_session_process_events() in the main thread to get
+   * libspotify to do more work. Failure to do so may cause request timeouts,
+   * or a lost connection.
+   *
+   * @param[in]  session    Session
+   *
+   * @note This function is called from an internal session thread - you need to have proper synchronization!
+   */
+  void (SP_CALLCONV *notify_main_thread)(sp_session *session);
+
+  /**
+   * Called when there is decompressed audio data available.
+   *
+   * @param[in]  session    Session
+   * @param[in]  format     Audio format descriptor sp_audioformat
+   * @param[in]  frames     Points to raw PCM data as described by \p format
+   * @param[in]  num_frames Number of available samples in \p frames.
+   *                        If this is 0, a discontinuity has occurred (such as after a seek). The application
+   *                        should flush its audio fifos, etc.
+   *
+   * @return                Number of frames consumed.
+   *                        This value can be used to rate limit the output from the library if your
+   *                        output buffers are saturated. The library will retry delivery in about 100ms.
+   *
+   * @note This function is called from an internal session thread - you need to have proper synchronization!
+   *
+   * @note This function must never block. If your output buffers are full you must return 0 to signal
+   *       that the library should retry delivery in a short while.
+   */
+  int (SP_CALLCONV *music_delivery)(sp_session *session, const sp_audioformat *format, const void *frames, int num_frames);
+
+  /**
+   * Music has been paused because an account only allows music
+   * to be played from one location simultaneously.
+   *
+   * @note When this callback is invoked the application should
+   *       behave just as if the user pressed the pause
+   *       button. The application should also display a message
+   *       to the user indicating the playback has been paused
+   *       because another application is playing using the same
+   *       account.
+   *
+   * @note IT MUST NOT automatically resume playback but must
+   *       instead wait for the user to press play.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *play_token_lost)(sp_session *session);
+
+  /**
+   * Logging callback.
+   *
+   * @param[in]  session    Session
+   * @param[in]  data       Log data
+   */
+  void (SP_CALLCONV *log_message)(sp_session *session, const char *data);
+
+  /**
+   * End of track.
+   * Called when the currently played track has reached its end.
+   *
+   * @note This function is invoked from the main thread
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *end_of_track)(sp_session *session);
+
+  /**
+   * Streaming error.
+   * Called when streaming cannot start or continue.
+   *
+   * @note This function is invoked from the main thread
+   *
+   * @param[in]  session    Session
+   * @param[in]  error      One of the following errors, from ::sp_error
+   *                        SP_ERROR_NO_STREAM_AVAILABLE
+   *                        SP_ERROR_OTHER_TRANSIENT
+   *                        SP_ERROR_OTHER_PERMANENT
+   */
+  void (SP_CALLCONV *streaming_error)(sp_session *session, sp_error error);
+
+  /**
+   * Called after user info (anything related to sp_user objects) have been updated.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *userinfo_updated)(sp_session *session);
+
+  /**
+   * Called when audio playback should start
+   *
+   * @note For this to work correctly the application must also implement get_audio_buffer_stats()
+   *
+   * @note This function is called from an internal session thread - you need to have proper synchronization!
+   *
+   * @note This function must never block.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *start_playback)(sp_session *session);
+
+
+  /**
+   * Called when audio playback should stop
+   *
+   * @note For this to work correctly the application must also implement get_audio_buffer_stats()
+   *
+   * @note This function is called from an internal session thread - you need to have proper synchronization!
+   *
+   * @note This function must never block.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *stop_playback)(sp_session *session);
+
+  /**
+   * Called to query application about its audio buffer
+   *
+   * @note This function is called from an internal session thread - you need to have proper synchronization!
+   *
+   * @note This function must never block.
+   *
+   * @param[in]  session    Session
+   * @param[out] stats      Stats struct to be filled by application
+   */
+  void (SP_CALLCONV *get_audio_buffer_stats)(sp_session *session, sp_audio_buffer_stats *stats);
+
+  /**
+   * Called when offline synchronization status is updated
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *offline_status_updated)(sp_session *session);
+
+  /**
+   * Called when offline synchronization status is updated
+   *
+   * @param[in]  session    Session
+   * @param[in]  error      Offline error. Will be SP_ERROR_OK if the offline synchronization
+   *                        error state has cleared
+   */
+  void (SP_CALLCONV *offline_error)(sp_session *session, sp_error error);
+
+  /**
+   * Called when storable credentials have been updated, usually called when
+   * we have connected to the AP.
+   *
+   * @param[in]  session    Session
+   * @param[in]  blob   Blob is a null-terminated string which contains
+   *        an encrypted token that can be stored safely on disk
+   *        instead of storing plaintext passwords.
+   */
+  void (SP_CALLCONV *credentials_blob_updated)(sp_session *session, const char *blob);
+
+  /**
+   * Called when the connection state has updated - such as when logging in, going offline, etc.
+   *
+   * @param[in]  session    Session
+   */
+  void (SP_CALLCONV *connectionstate_updated)(sp_session *session);
 
    /**
-	* Called when there is a scrobble error event
-	*
-	* @param[in]  session    Session
-	* @param[in]  error      Scrobble error. Currently SP_ERROR_LASTFM_AUTH_ERROR.
-	*/
-	void (SP_CALLCONV *scrobble_error)(sp_session *session, sp_error error);
+  * Called when there is a scrobble error event
+  *
+  * @param[in]  session    Session
+  * @param[in]  error      Scrobble error. Currently SP_ERROR_LASTFM_AUTH_ERROR.
+  */
+  void (SP_CALLCONV *scrobble_error)(sp_session *session, sp_error error);
 
    /**
-	* Called when there is a change in the private session mode
-	*
-	* @param[in]  session    Session
-	* @param[in]  isPrivate  True if in private session, false otherwhise
-	*/
-	void (SP_CALLCONV *private_session_mode_changed)(sp_session *session, bool is_private);
+  * Called when there is a change in the private session mode
+  *
+  * @param[in]  session    Session
+  * @param[in]  isPrivate  True if in private session, false otherwhise
+  */
+  void (SP_CALLCONV *private_session_mode_changed)(sp_session *session, bool is_private);
 } sp_session_callbacks;
 
 /**
  * Session config
  */
 typedef struct sp_session_config {
-	int api_version;                       ///< The version of the Spotify API your application is compiled with. Set to #SPOTIFY_API_VERSION
-	const char *cache_location;            /**< The location where Spotify will write cache files.
-						*   This cache include tracks, cached browse results and coverarts.
-	                                        *   Set to empty string ("") to disable cache
-						*/
-	const char *settings_location;         /**< The location where Spotify will write setting files and per-user
-						*   cache items. This includes playlists, track metadata, etc.
-						*   'settings_location' may be the same path as 'cache_location'.
-						*   'settings_location' folder will not be created (unlike 'cache_location'),
-						*   if you don't want to create the folder yourself, you can set 'settings_location' to 'cache_location'.
-						*/
-	const void *application_key;           ///< Your application key
-	size_t application_key_size;           ///< The size of the application key in bytes
-	const char *user_agent;                /**< "User-Agent" for your application - max 255 characters long
-						     The User-Agent should be a relevant, customer facing identification of your application
-					       */
-
-	const sp_session_callbacks *callbacks; ///< Delivery callbacks for session events, or NULL if you are not interested in any callbacks (not recommended!)
-	void *userdata;                        ///< User supplied data for your application
-
-	/**
-	 * Compress local copy of playlists, reduces disk space usage
-	 */
-	bool compress_playlists;
-
-	/**
-	 * Don't save metadata for local copies of playlists
-	 * Reduces disk space usage at the expense of needing
-	 * to request metadata from Spotify backend when loading list
-	 */
-	bool dont_save_metadata_for_playlists;
-
-	/**
-	 * Avoid loading playlists into RAM on startup. 
-	 * See sp_playlist_is_in_ram() for more details.
-	 */
-	bool initially_unload_playlists;
-
-	/**
-	 * Device ID for offline synchronization and logging purposes. The Device Id must be unique to the particular device instance,
-	 * i.e. no two units must supply the same Device ID. The Device ID must not change between sessions or power cycles.
-	 * Good examples is the device's MAC address or unique serial number.
-	 */
-	const char *device_id;
-
-	/**
-	 * Url to the proxy server that should be used.
-	 * The format is protocol://<host>:port (where protocal is http/https/socks4/socks5)
-	 */
-	const char *proxy;
-	/**
-	 * Username to authenticate with proxy server
-	 */
-	const char *proxy_username;
-	/**
-	 * Password to authenticate with proxy server
-	 */
-	const char *proxy_password;
-
-
-	/**
-	 * Path to API trace file
-	 */
-	const char *tracefile;
+  int api_version;                       ///< The version of the Spotify API your application is compiled with. Set to #SPOTIFY_API_VERSION
+  const char *cache_location;            /**< The location where Spotify will write cache files.
+            *   This cache include tracks, cached browse results and coverarts.
+                                          *   Set to empty string ("") to disable cache
+            */
+  const char *settings_location;         /**< The location where Spotify will write setting files and per-user
+            *   cache items. This includes playlists, track metadata, etc.
+            *   'settings_location' may be the same path as 'cache_location'.
+            *   'settings_location' folder will not be created (unlike 'cache_location'),
+            *   if you don't want to create the folder yourself, you can set 'settings_location' to 'cache_location'.
+            */
+  const void *application_key;           ///< Your application key
+  size_t application_key_size;           ///< The size of the application key in bytes
+  const char *user_agent;                /**< "User-Agent" for your application - max 255 characters long
+                 The User-Agent should be a relevant, customer facing identification of your application
+                 */
+
+  const sp_session_callbacks *callbacks; ///< Delivery callbacks for session events, or NULL if you are not interested in any callbacks (not recommended!)
+  void *userdata;                        ///< User supplied data for your application
+
+  /**
+   * Compress local copy of playlists, reduces disk space usage
+   */
+  bool compress_playlists;
+
+  /**
+   * Don't save metadata for local copies of playlists
+   * Reduces disk space usage at the expense of needing
+   * to request metadata from Spotify backend when loading list
+   */
+  bool dont_save_metadata_for_playlists;
+
+  /**
+   * Avoid loading playlists into RAM on startup.
+   * See sp_playlist_is_in_ram() for more details.
+   */
+  bool initially_unload_playlists;
+
+  /**
+   * Device ID for offline synchronization and logging purposes. The Device Id must be unique to the particular device instance,
+   * i.e. no two units must supply the same Device ID. The Device ID must not change between sessions or power cycles.
+   * Good examples is the device's MAC address or unique serial number.
+   */
+  const char *device_id;
+
+  /**
+   * Url to the proxy server that should be used.
+   * The format is protocol://<host>:port (where protocal is http/https/socks4/socks5)
+   */
+  const char *proxy;
+  /**
+   * Username to authenticate with proxy server
+   */
+  const char *proxy_username;
+  /**
+   * Password to authenticate with proxy server
+   */
+  const char *proxy_password;
+
+
+  /**
+   * Path to API trace file
+   */
+  const char *tracefile;
 
 } sp_session_config;
 
@@ -757,7 +757,7 @@ SP_LIBEXPORT(sp_error) sp_session_release(sp_session *sess);
  * @param[in]   username            The username to log in
  * @param[in]   password            The password for the specified username
  * @param[in]   remember_me         If set, the username / password will be remembered by libspotify
- * @param[in]   blob	            If you have received a blob in the #credentials_blob_updated
+ * @param[in]   blob              If you have received a blob in the #credentials_blob_updated
  *                                  you can pas this here instead of password
  * @return                          One of the following errors, from ::sp_error
  *                                  SP_ERROR_OK
@@ -904,7 +904,7 @@ SP_LIBEXPORT(sp_error) sp_session_process_events(sp_session *session, int *next_
  *                         SP_ERROR_OK
  *                         SP_ERROR_MISSING_CALLBACK
  *                         SP_ERROR_TRACK_NOT_PLAYABLE
- * 
+ *
  */
 SP_LIBEXPORT(sp_error) sp_session_player_load(sp_session *session, sp_track *track);
 
@@ -1005,7 +1005,7 @@ SP_LIBEXPORT(sp_playlist *) sp_session_starred_for_user_create(sp_session *sessi
  * Return the published container for a given @a canonical_username,
  * or the currently logged in user if @a canonical_username is NULL.
  *
- * When done with the list you should call sp_playlistconatiner_release() to 
+ * When done with the list you should call sp_playlistconatiner_release() to
  * decrese the reference you own by having created it.
  *
  * @param[in]   session    Your session object.
@@ -1045,7 +1045,7 @@ SP_LIBEXPORT(sp_error) sp_session_preferred_offline_bitrate(sp_session *session,
  * Return status of volume normalization
  *
  * @param[in]  session        Session object
- * 
+ *
  * @return true iff volume normalization is enabled
  *
  */
@@ -1248,16 +1248,16 @@ SP_LIBEXPORT(int) sp_session_user_country(sp_session *session);
  * Link types
  */
 typedef enum {
-	SP_LINKTYPE_INVALID  = 0, ///< Link type not valid - default until the library has parsed the link, or when parsing failed
-	SP_LINKTYPE_TRACK    = 1, ///< Link type is track
-	SP_LINKTYPE_ALBUM    = 2, ///< Link type is album
-	SP_LINKTYPE_ARTIST   = 3, ///< Link type is artist
-	SP_LINKTYPE_SEARCH   = 4, ///< Link type is search
-	SP_LINKTYPE_PLAYLIST = 5, ///< Link type is playlist
-	SP_LINKTYPE_PROFILE  = 6, ///< Link type is profile
-	SP_LINKTYPE_STARRED  = 7, ///< Link type is starred
-	SP_LINKTYPE_LOCALTRACK  = 8, ///< Link type is a local file	
-	SP_LINKTYPE_IMAGE = 9, ///< Link type is an image
+  SP_LINKTYPE_INVALID  = 0, ///< Link type not valid - default until the library has parsed the link, or when parsing failed
+  SP_LINKTYPE_TRACK    = 1, ///< Link type is track
+  SP_LINKTYPE_ALBUM    = 2, ///< Link type is album
+  SP_LINKTYPE_ARTIST   = 3, ///< Link type is artist
+  SP_LINKTYPE_SEARCH   = 4, ///< Link type is search
+  SP_LINKTYPE_PLAYLIST = 5, ///< Link type is playlist
+  SP_LINKTYPE_PROFILE  = 6, ///< Link type is profile
+  SP_LINKTYPE_STARRED  = 7, ///< Link type is starred
+  SP_LINKTYPE_LOCALTRACK  = 8, ///< Link type is a local file
+  SP_LINKTYPE_IMAGE = 9, ///< Link type is an image
 } sp_linktype;
 
 /**
@@ -1773,10 +1773,10 @@ SP_LIBEXPORT(sp_error) sp_track_release(sp_track *track);
  * Album types
  */
 typedef enum {
-	SP_ALBUMTYPE_ALBUM       = 0, ///< Normal album
-	SP_ALBUMTYPE_SINGLE      = 1, ///< Single
-	SP_ALBUMTYPE_COMPILATION = 2, ///< Compilation
-	SP_ALBUMTYPE_UNKNOWN     = 3, ///< Unknown type
+  SP_ALBUMTYPE_ALBUM       = 0, ///< Normal album
+  SP_ALBUMTYPE_SINGLE      = 1, ///< Single
+  SP_ALBUMTYPE_COMPILATION = 2, ///< Compilation
+  SP_ALBUMTYPE_UNKNOWN     = 3, ///< Unknown type
 } sp_albumtype;
 
 /**
@@ -2332,8 +2332,8 @@ SP_LIBEXPORT(sp_error) sp_artistbrowse_release(sp_artistbrowse *arb);
  * Image format
  */
 typedef enum {
-	SP_IMAGE_FORMAT_UNKNOWN = -1, ///< Unknown image format
-	SP_IMAGE_FORMAT_JPEG   = 0,   ///< JPEG image
+  SP_IMAGE_FORMAT_UNKNOWN = -1, ///< Unknown image format
+  SP_IMAGE_FORMAT_JPEG   = 0,   ///< JPEG image
 } sp_imageformat;
 
 /**
@@ -2577,6 +2577,16 @@ SP_LIBEXPORT(sp_album *) sp_search_album(sp_search *search, int index);
  */
 SP_LIBEXPORT(int) sp_search_num_playlists(sp_search *search);
 
+/**
+ * Load the playlist at the given index in the given search object
+ *
+ * @param[in]  search     Search object
+ * @param[in]  index      Index of the wanted playlist. Should be in the interval [0, sp_search_num_playlists() - 1]
+ *
+ * @return                A playlist object. This reference is owned by the caller and should be released with sp_playlist_release()
+ */
+SP_LIBEXPORT(sp_playlist *) sp_search_playlist(sp_search *search, int index);
+
 /**
  * Return the playlist at the given index in the given search object
  *
@@ -2731,142 +2741,142 @@ SP_LIBEXPORT(sp_error) sp_search_release(sp_search *search);
  */
 typedef struct sp_playlist_callbacks {
 
-	/**
-	 * Called when one or more tracks have been added to a playlist
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  tracks     Array of pointers to track objects
-	 * @param[in]  num_tracks Number of entries in \p tracks
-	 * @param[in]  position   Position in the playlist for the first track.
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *tracks_added)(sp_playlist *pl, sp_track * const *tracks, int num_tracks, int position, void *userdata);
-
-	/**
-	 * Called when one or more tracks have been removed from a playlist
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  tracks     Array of positions representing the tracks that were removed
-	 * @param[in]  num_tracks Number of entries in \p tracks
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *tracks_removed)(sp_playlist *pl, const int *tracks, int num_tracks, void *userdata);
-
-	/**
-	 * Called when one or more tracks have been moved within a playlist
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  tracks     Array of positions representing the tracks that were moved
-	 * @param[in]  num_tracks Number of entries in \p tracks
-	 * @param[in]  position   New position in the playlist for the first track.
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *tracks_moved)(sp_playlist *pl, const int *tracks, int num_tracks, int new_position, void *userdata);
-
-	/**
-	 * Called when a playlist has been renamed. sp_playlist_name() can be used to find out the new name
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_renamed)(sp_playlist *pl, void *userdata);
-
-	/**
-	 * Called when state changed for a playlist.
-	 *
-	 * There are three states that trigger this callback:
-	 * - Collaboration for this playlist has been turned on or off
-	 * - The playlist started having pending changes, or all pending changes have now been committed
-	 * - The playlist started loading, or finished loading
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 * @sa sp_playlist_is_collaborative
-	 * @sa sp_playlist_has_pending_changes
-	 * @sa sp_playlist_is_loaded
-	 */
-	void (SP_CALLCONV *playlist_state_changed)(sp_playlist *pl, void *userdata);
-
-	/**
-	 * Called when a playlist is updating or is done updating
-	 *
-	 * This is called before and after a series of changes are applied to the
-	 * playlist. It allows e.g. the user interface to defer updating until the
-	 * entire operation is complete.
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  done       True iff the update is completed
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_update_in_progress)(sp_playlist *pl, bool done, void *userdata);
-
-	/**
-	 * Called when metadata for one or more tracks in a playlist has been updated.
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_metadata_updated)(sp_playlist *pl, void *userdata);
-
-	/**
-	 * Called when create time and/or creator for a playlist entry changes
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  position   Position in playlist
-	 * @param[in]  user       User object
-	 * @param[in]  time       When entry was created, seconds since the unix epoch.
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *track_created_changed)(sp_playlist *pl, int position, sp_user *user, int when, void *userdata);
-
-	/**
-	 * Called when seen attribute for a playlist entry changes.
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  position   Position in playlist
-	 * @param[in]  seen       Set if entry it marked as seen
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *track_seen_changed)(sp_playlist *pl, int position, bool seen, void *userdata);
-
-	/**
-	 * Called when playlist description has changed
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  desc       New description
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *description_changed)(sp_playlist *pl, const char *desc, void *userdata);
-
-
-	/**
-	 * Called when playlist image has changed
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  image      New image
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *image_changed)(sp_playlist *pl, const byte *image, void *userdata);
-
-
-	/**
-	 * Called when message attribute for a playlist entry changes.
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  position   Position in playlist
-	 * @param[in]  message    UTF-8 encoded message
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *track_message_changed)(sp_playlist *pl, int position, const char *message, void *userdata);
-
-
-	/**
-	 * Called when playlist subscribers changes (count or list of names)
-	 *
-	 * @param[in]  pl         Playlist object
-	 * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
-	 */
-	void (SP_CALLCONV *subscribers_changed)(sp_playlist *pl, void *userdata);
+  /**
+   * Called when one or more tracks have been added to a playlist
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  tracks     Array of pointers to track objects
+   * @param[in]  num_tracks Number of entries in \p tracks
+   * @param[in]  position   Position in the playlist for the first track.
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *tracks_added)(sp_playlist *pl, sp_track * const *tracks, int num_tracks, int position, void *userdata);
+
+  /**
+   * Called when one or more tracks have been removed from a playlist
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  tracks     Array of positions representing the tracks that were removed
+   * @param[in]  num_tracks Number of entries in \p tracks
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *tracks_removed)(sp_playlist *pl, const int *tracks, int num_tracks, void *userdata);
+
+  /**
+   * Called when one or more tracks have been moved within a playlist
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  tracks     Array of positions representing the tracks that were moved
+   * @param[in]  num_tracks Number of entries in \p tracks
+   * @param[in]  position   New position in the playlist for the first track.
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *tracks_moved)(sp_playlist *pl, const int *tracks, int num_tracks, int new_position, void *userdata);
+
+  /**
+   * Called when a playlist has been renamed. sp_playlist_name() can be used to find out the new name
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_renamed)(sp_playlist *pl, void *userdata);
+
+  /**
+   * Called when state changed for a playlist.
+   *
+   * There are three states that trigger this callback:
+   * - Collaboration for this playlist has been turned on or off
+   * - The playlist started having pending changes, or all pending changes have now been committed
+   * - The playlist started loading, or finished loading
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   * @sa sp_playlist_is_collaborative
+   * @sa sp_playlist_has_pending_changes
+   * @sa sp_playlist_is_loaded
+   */
+  void (SP_CALLCONV *playlist_state_changed)(sp_playlist *pl, void *userdata);
+
+  /**
+   * Called when a playlist is updating or is done updating
+   *
+   * This is called before and after a series of changes are applied to the
+   * playlist. It allows e.g. the user interface to defer updating until the
+   * entire operation is complete.
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  done       True iff the update is completed
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_update_in_progress)(sp_playlist *pl, bool done, void *userdata);
+
+  /**
+   * Called when metadata for one or more tracks in a playlist has been updated.
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_metadata_updated)(sp_playlist *pl, void *userdata);
+
+  /**
+   * Called when create time and/or creator for a playlist entry changes
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  position   Position in playlist
+   * @param[in]  user       User object
+   * @param[in]  time       When entry was created, seconds since the unix epoch.
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *track_created_changed)(sp_playlist *pl, int position, sp_user *user, int when, void *userdata);
+
+  /**
+   * Called when seen attribute for a playlist entry changes.
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  position   Position in playlist
+   * @param[in]  seen       Set if entry it marked as seen
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *track_seen_changed)(sp_playlist *pl, int position, bool seen, void *userdata);
+
+  /**
+   * Called when playlist description has changed
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  desc       New description
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *description_changed)(sp_playlist *pl, const char *desc, void *userdata);
+
+
+  /**
+   * Called when playlist image has changed
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  image      New image
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *image_changed)(sp_playlist *pl, const byte *image, void *userdata);
+
+
+  /**
+   * Called when message attribute for a playlist entry changes.
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  position   Position in playlist
+   * @param[in]  message    UTF-8 encoded message
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *track_message_changed)(sp_playlist *pl, int position, const char *message, void *userdata);
+
+
+  /**
+   * Called when playlist subscribers changes (count or list of names)
+   *
+   * @param[in]  pl         Playlist object
+   * @param[in]  userdata   Userdata passed to sp_playlist_add_callbacks()
+   */
+  void (SP_CALLCONV *subscribers_changed)(sp_playlist *pl, void *userdata);
 
 } sp_playlist_callbacks;
 
@@ -3310,46 +3320,46 @@ SP_LIBEXPORT(sp_error) sp_playlist_release(sp_playlist *playlist);
  * @see sp_playlistcontainer_remove_callbacks
  */
 typedef struct sp_playlistcontainer_callbacks {
-	/**
-	 * Called when a new playlist has been added to the playlist container.
-	 *
-	 * @param[in]  pc         Playlist container
-	 * @param[in]  playlist   Playlist object.
-	 * @param[in]  position   Position in list
-	 * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_added)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, void *userdata);
-
-
-	/**
-	 * Called when a new playlist has been removed from playlist container
-	 *
-	 * @param[in]  pc         Playlist container
-	 * @param[in]  playlist   Playlist object.
-	 * @param[in]  position   Position in list
-	 * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_removed)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, void *userdata);
-
-
-	/**
-	 * Called when a playlist has been moved in the playlist container
-	 *
-	 * @param[in]  pc         Playlist container
-	 * @param[in]  playlist   Playlist object.
-	 * @param[in]  position   Previous position in playlist container list
-	 * @param[in]  new_position   New position in playlist container list
-	 * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
-	 */
-	void (SP_CALLCONV *playlist_moved)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, int new_position, void *userdata);
-
-	/**
-	 * Called when the playlist container is loaded
-	 *
-	 * @param[in]  pc         Playlist container
-	 * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
-	 */
-	void (SP_CALLCONV *container_loaded)(sp_playlistcontainer *pc, void *userdata);
+  /**
+   * Called when a new playlist has been added to the playlist container.
+   *
+   * @param[in]  pc         Playlist container
+   * @param[in]  playlist   Playlist object.
+   * @param[in]  position   Position in list
+   * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_added)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, void *userdata);
+
+
+  /**
+   * Called when a new playlist has been removed from playlist container
+   *
+   * @param[in]  pc         Playlist container
+   * @param[in]  playlist   Playlist object.
+   * @param[in]  position   Position in list
+   * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_removed)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, void *userdata);
+
+
+  /**
+   * Called when a playlist has been moved in the playlist container
+   *
+   * @param[in]  pc         Playlist container
+   * @param[in]  playlist   Playlist object.
+   * @param[in]  position   Previous position in playlist container list
+   * @param[in]  new_position   New position in playlist container list
+   * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
+   */
+  void (SP_CALLCONV *playlist_moved)(sp_playlistcontainer *pc, sp_playlist *playlist, int position, int new_position, void *userdata);
+
+  /**
+   * Called when the playlist container is loaded
+   *
+   * @param[in]  pc         Playlist container
+   * @param[in]  userdata   Userdata as set in sp_playlistcontainer_add_callbacks()
+   */
+  void (SP_CALLCONV *container_loaded)(sp_playlistcontainer *pc, void *userdata);
 } sp_playlistcontainer_callbacks;
 
 
@@ -3539,7 +3549,7 @@ SP_LIBEXPORT(sp_error) sp_playlistcontainer_add_folder(sp_playlistcontainer *pc,
  * Return a pointer to the user object of the owner.
  *
  * @param[in]  pc   Playlist container.
- * @return          The user object or NULL if unknown or none.     
+ * @return          The user object or NULL if unknown or none.
  */
 SP_LIBEXPORT(sp_user *) sp_playlistcontainer_owner(sp_playlistcontainer *pc);
 
@@ -3669,9 +3679,9 @@ SP_LIBEXPORT(sp_error) sp_user_release(sp_user *user);
  * Toplist types
  */
 typedef enum {
-	SP_TOPLIST_TYPE_ARTISTS = 0, ///< Top artists
-	SP_TOPLIST_TYPE_ALBUMS  = 1, ///< Top albums
-	SP_TOPLIST_TYPE_TRACKS  = 2, ///< Top tracks
+  SP_TOPLIST_TYPE_ARTISTS = 0, ///< Top artists
+  SP_TOPLIST_TYPE_ALBUMS  = 1, ///< Top albums
+  SP_TOPLIST_TYPE_TRACKS  = 2, ///< Top tracks
 } sp_toplisttype;
 
 
@@ -3688,8 +3698,8 @@ typedef enum {
  * Special toplist regions
  */
 typedef enum {
-	SP_TOPLIST_REGION_EVERYWHERE = 0, ///< Global toplist
-	SP_TOPLIST_REGION_USER = 1,       ///< Toplist for a given user
+  SP_TOPLIST_REGION_EVERYWHERE = 0, ///< Global toplist
+  SP_TOPLIST_REGION_USER = 1,       ///< Toplist for a given user
 } sp_toplistregion;
 
 
@@ -3859,7 +3869,7 @@ SP_LIBEXPORT(int) sp_toplistbrowse_backend_request_duration(sp_toplistbrowse *tl
 typedef void SP_CALLCONV inboxpost_complete_cb(sp_inbox *result, void *userdata);
 
 /**
- * Add to inbox 
+ * Add to inbox
  *
  * @param[in]  session    Session object
  * @param[in]  user       Canonical username of recipient