aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlaylistFile.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/PlaylistFile.cxx
parent43f613d9be9aa2953dcfc0aacfbdfb56d5d1a708 (diff)
downloadmpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.gz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.tar.xz
mpd-ba161ec572b98d3bcf9f735ff122133319fe896a.zip
song: convert header to C++
Diffstat (limited to '')
-rw-r--r--src/PlaylistFile.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 8cc009e0c..6541e6598 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -24,7 +24,7 @@
#include "PlaylistVector.hxx"
#include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx"
-#include "song.h"
+#include "Song.hxx"
#include "io_error.h"
#include "Mapper.hxx"
#include "TextFile.hxx"
@@ -360,7 +360,7 @@ spl_remove_index(const char *utf8path, unsigned pos, GError **error_r)
}
bool
-spl_append_song(const char *utf8path, struct song *song, GError **error_r)
+spl_append_song(const char *utf8path, Song *song, GError **error_r)
{
if (spl_map(error_r).IsNull())
return false;
@@ -402,16 +402,16 @@ bool
spl_append_uri(const char *url, const char *utf8file, GError **error_r)
{
if (uri_has_scheme(url)) {
- struct song *song = song_remote_new(url);
+ Song *song = Song::NewRemote(url);
bool success = spl_append_song(utf8file, song, error_r);
- song_free(song);
+ song->Free();
return success;
} else {
const Database *db = GetDatabase(error_r);
if (db == nullptr)
return false;
- song *song = db->GetSong(url, error_r);
+ Song *song = db->GetSong(url, error_r);
if (song == nullptr)
return false;