aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-02 22:42:12 +0100
committerMax Kellermann <max@duempel.org>2013-01-02 22:42:12 +0100
commit43cbbe111b2429b41b1896f228625cf5692c3d88 (patch)
tree68c9daf2c6c5c5a81705694dd819358f21f552cc
parent9ceb8a717ae940972904ef83722f71c3ee124715 (diff)
song_update: convert to C++
-rw-r--r--Makefile.am2
-rw-r--r--src/SongUpdate.cxx (renamed from src/song_update.c)11
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 1ae249c8..76ec6a61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -309,7 +309,7 @@ src_mpd_SOURCES = \
src/replay_gain_info.c \
src/sig_handlers.c \
src/Song.cxx \
- src/song_update.c \
+ src/SongUpdate.cxx \
src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \
src/resolver.c src/resolver.h \
diff --git a/src/song_update.c b/src/SongUpdate.cxx
index 37f502a2..114ad875 100644
--- a/src/song_update.c
+++ b/src/SongUpdate.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,9 +18,15 @@
*/
#include "config.h" /* must be first for large file support */
+
+extern "C" {
#include "song.h"
#include "uri.h"
+}
+
#include "directory.h"
+
+extern "C" {
#include "mapper.h"
#include "decoder_list.h"
#include "decoder_plugin.h"
@@ -29,6 +35,7 @@
#include "tag.h"
#include "tag_handler.h"
#include "input_stream.h"
+}
#include <glib.h>
@@ -187,7 +194,7 @@ song_file_update_inarchive(struct song *song)
if (suffix == NULL)
return false;
- plugin = decoder_plugin_from_suffix(suffix, false);
+ plugin = decoder_plugin_from_suffix(suffix, nullptr);
if (plugin == NULL)
return false;