aboutsummaryrefslogtreecommitdiffstats
path: root/src/directory_save.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-02 19:52:57 +0100
committerMax Kellermann <max@duempel.org>2013-01-02 20:22:59 +0100
commitb715e522cff7109c370e66d29ba22340c9259c52 (patch)
treeabda37d8d414592c59f8f875a3b1b439c5d81725 /src/directory_save.c
parent4b0b8315a918be5ad92d5aeb0c7df6d28966b951 (diff)
downloadmpd-b715e522cff7109c370e66d29ba22340c9259c52.tar.gz
mpd-b715e522cff7109c370e66d29ba22340c9259c52.tar.xz
mpd-b715e522cff7109c370e66d29ba22340c9259c52.zip
db_save, state_file: convert to C++
Diffstat (limited to '')
-rw-r--r--src/DirectorySave.cxx (renamed from src/directory_save.c)13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/directory_save.c b/src/DirectorySave.cxx
index de1df050a..83a1ffd5a 100644
--- a/src/directory_save.c
+++ b/src/DirectorySave.cxx
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
+ * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -18,12 +18,15 @@
*/
#include "config.h"
-#include "directory_save.h"
+#include "DirectorySave.hxx"
#include "directory.h"
#include "song.h"
+#include "SongSave.hxx"
+#include "PlaylistDatabase.hxx"
+
+extern "C" {
#include "text_file.h"
-#include "song_save.h"
-#include "playlist_database.h"
+}
#include <assert.h>
#include <string.h>
@@ -152,7 +155,7 @@ directory_load(FILE *fp, struct directory *directory,
if (directory_get_song(directory, name) != NULL) {
g_set_error(error, directory_quark(), 0,
"Duplicate song '%s'", name);
- return NULL;
+ return false;
}
song = song_load(fp, directory, name,