aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlaylistPrint.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
committerMax Kellermann <max@duempel.org>2013-07-28 13:25:12 +0200
commitba161ec572b98d3bcf9f735ff122133319fe896a (patch)
treea211690e3a8b7fce1fb6db540228122bead1f2bc /src/PlaylistPrint.cxx
parent43f613d9be9aa2953dcfc0aacfbdfb56d5d1a708 (diff)
downloadmpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.gz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.xz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.zip
song: convert header to C++
Diffstat (limited to 'src/PlaylistPrint.cxx')
-rw-r--r--src/PlaylistPrint.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/PlaylistPrint.cxx b/src/PlaylistPrint.cxx
index e79e87732..35498eeba 100644
--- a/src/PlaylistPrint.cxx
+++ b/src/PlaylistPrint.cxx
@@ -31,10 +31,7 @@
#include "DatabasePlugin.hxx"
#include "Client.hxx"
#include "input_stream.h"
-
-extern "C" {
-#include "song.h"
-}
+#include "Song.hxx"
void
playlist_print_uris(Client *client, const struct playlist *playlist)
@@ -119,7 +116,7 @@ PrintSongDetails(Client *client, const char *uri_utf8)
if (db == nullptr)
return false;
- song *song = db->GetSong(uri_utf8, nullptr);
+ Song *song = db->GetSong(uri_utf8, nullptr);
if (song == nullptr)
return false;
@@ -152,7 +149,7 @@ static void
playlist_provider_print(Client *client, const char *uri,
struct playlist_provider *playlist, bool detail)
{
- struct song *song;
+ Song *song;
char *base_uri = uri != NULL ? g_path_get_dirname(uri) : NULL;
while ((song = playlist_plugin_read(playlist)) != NULL) {
@@ -165,7 +162,7 @@ playlist_provider_print(Client *client, const char *uri,
else
song_print_uri(client, song);
- song_free(song);
+ song->Free();
}
g_free(base_uri);