aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/DespotifyUtils.cxx20
-rw-r--r--src/DespotifyUtils.hxx2
-rw-r--r--src/input/DespotifyInputPlugin.cxx2
-rw-r--r--src/playlist/DespotifyPlaylistPlugin.cxx10
4 files changed, 17 insertions, 17 deletions
diff --git a/src/DespotifyUtils.cxx b/src/DespotifyUtils.cxx
index c2e88b013..2a30f11f3 100644
--- a/src/DespotifyUtils.cxx
+++ b/src/DespotifyUtils.cxx
@@ -85,28 +85,28 @@ void mpd_despotify_unregister_callback(void (*cb)(struct despotify_session *, in
Tag *
-mpd_despotify_tag_from_track(struct ds_track *track)
+mpd_despotify_tag_from_track(const ds_track &track)
{
char tracknum[20];
char comment[80];
char date[20];
- if (!track->has_meta_data)
+ if (!track.has_meta_data)
return new Tag();
TagBuilder tag;
- snprintf(tracknum, sizeof(tracknum), "%d", track->tracknumber);
- snprintf(date, sizeof(date), "%d", track->year);
+ snprintf(tracknum, sizeof(tracknum), "%d", track.tracknumber);
+ snprintf(date, sizeof(date), "%d", track.year);
snprintf(comment, sizeof(comment), "Bitrate %d Kbps, %sgeo restricted",
- track->file_bitrate / 1000,
- track->geo_restricted ? "" : "not ");
- tag.AddItem(TAG_TITLE, track->title);
- tag.AddItem(TAG_ARTIST, track->artist->name);
+ track.file_bitrate / 1000,
+ track.geo_restricted ? "" : "not ");
+ tag.AddItem(TAG_TITLE, track.title);
+ tag.AddItem(TAG_ARTIST, track.artist->name);
tag.AddItem(TAG_TRACK, tracknum);
- tag.AddItem(TAG_ALBUM, track->album);
+ tag.AddItem(TAG_ALBUM, track.album);
tag.AddItem(TAG_DATE, date);
tag.AddItem(TAG_COMMENT, comment);
- tag.SetTime(track->length / 1000);
+ tag.SetTime(track.length / 1000);
return tag.CommitNew();
}
diff --git a/src/DespotifyUtils.hxx b/src/DespotifyUtils.hxx
index c0d4af47c..ad22acf92 100644
--- a/src/DespotifyUtils.hxx
+++ b/src/DespotifyUtils.hxx
@@ -45,7 +45,7 @@ struct despotify_session *mpd_despotify_get_session(void);
* @return a pointer to the filled in tags structure
*/
Tag *
-mpd_despotify_tag_from_track(struct ds_track *track);
+mpd_despotify_tag_from_track(const ds_track &track);
/**
* Register a despotify callback.
diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx
index 38c2aac75..787e0722e 100644
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -52,7 +52,7 @@ class DespotifyInputStream {
ds_track *_track)
:base(input_plugin_despotify, uri, mutex, cond),
session(_session), track(_track),
- tag(mpd_despotify_tag_from_track(track)),
+ tag(mpd_despotify_tag_from_track(*track)),
len_available(0), eof(false) {
memset(&pcm, 0, sizeof(pcm));
diff --git a/src/playlist/DespotifyPlaylistPlugin.cxx b/src/playlist/DespotifyPlaylistPlugin.cxx
index a1a865c08..f082778ab 100644
--- a/src/playlist/DespotifyPlaylistPlugin.cxx
+++ b/src/playlist/DespotifyPlaylistPlugin.cxx
@@ -34,7 +34,7 @@ extern "C" {
#include <stdlib.h>
static void
-add_song(std::forward_list<SongPointer> &songs, struct ds_track *track)
+add_song(std::forward_list<SongPointer> &songs, ds_track &track)
{
const char *dsp_scheme = despotify_playlist_plugin.schemes[0];
Song *song;
@@ -45,10 +45,10 @@ add_song(std::forward_list<SongPointer> &songs, struct ds_track *track)
snprintf(uri, sizeof(uri), "%s://", dsp_scheme);
ds_uri = uri + strlen(dsp_scheme) + 3;
- if (despotify_track_to_uri(track, ds_uri) != ds_uri) {
+ if (despotify_track_to_uri(&track, ds_uri) != ds_uri) {
/* Should never really fail, but let's be sure */
FormatDebug(despotify_domain,
- "Can't add track %s", track->title);
+ "Can't add track %s", track.title);
return;
}
@@ -67,7 +67,7 @@ parse_track(struct despotify_session *session,
if (track == nullptr)
return false;
- add_song(songs, track);
+ add_song(songs, *track);
return true;
}
@@ -82,7 +82,7 @@ parse_playlist(struct despotify_session *session,
for (ds_track *track = playlist->tracks; track != nullptr;
track = track->next)
- add_song(songs, track);
+ add_song(songs, *track);
return true;
}