aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-30 09:08:50 +0100
committerMax Kellermann <max@duempel.org>2013-01-30 09:17:03 +0100
commit718fd97612c298b7eac47289c1803a2a19d9a859 (patch)
tree7452de134e5bf8cf9d7c529dcc829b24f3dcd3aa
parentf8ff45b212c0c666d676dba9df0936a3bf6e98a5 (diff)
downloadmpd-718fd97612c298b7eac47289c1803a2a19d9a859.tar.gz
mpd-718fd97612c298b7eac47289c1803a2a19d9a859.tar.xz
mpd-718fd97612c298b7eac47289c1803a2a19d9a859.zip
icy_server: convert to C++
-rw-r--r--Makefile.am3
-rw-r--r--src/IcyMetaDataServer.cxx (renamed from src/icy_server.c)6
-rw-r--r--src/IcyMetaDataServer.hxx (renamed from src/icy_server.h)15
-rw-r--r--src/output/HttpdClient.cxx2
-rw-r--r--src/output/HttpdOutputPlugin.cxx2
5 files changed, 10 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am
index 3a1c72a9e..c14ff2ed8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -81,7 +81,6 @@ mpd_headers = \
src/decoder/pcm_decoder_plugin.h \
src/input_stream.h \
src/text_input_stream.h \
- src/icy_server.h \
src/ls.h \
src/mixer_api.h \
src/mixer_control.h \
@@ -889,7 +888,7 @@ endif
if ENABLE_HTTPD_OUTPUT
liboutput_plugins_a_SOURCES += \
- src/icy_server.c \
+ src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \
src/output/HttpdInternal.hxx \
src/output/HttpdClient.cxx src/output/HttpdClient.hxx \
src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx
diff --git a/src/icy_server.c b/src/IcyMetaDataServer.cxx
index 4971bc0ee..e7bd0acf4 100644
--- a/src/icy_server.c
+++ b/src/IcyMetaDataServer.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,7 +18,9 @@
*/
#include "config.h"
-#include "icy_server.h"
+#include "IcyMetaDataServer.hxx"
+#include "page.h"
+#include "tag.h"
#include <glib.h>
diff --git a/src/icy_server.h b/src/IcyMetaDataServer.hxx
index 15f6f36b7..78f1be7db 100644
--- a/src/icy_server.h
+++ b/src/IcyMetaDataServer.hxx
@@ -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
@@ -17,16 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef ICY_SERVER_H
-#define ICY_SERVER_H
+#ifndef MPD_ICY_META_DATA_SERVER_HXX
+#define MPD_ICY_META_DATA_SERVER_HXX
-#include "page.h"
#include "tag.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
char*
icy_server_metadata_header(const char *name,
const char *genre, const char *url,
@@ -35,8 +30,4 @@ icy_server_metadata_header(const char *name,
struct page*
icy_server_metadata_page(const struct tag *tag, const enum tag_type *types);
-#ifdef __cplusplus
-}
-#endif
-
#endif
diff --git a/src/output/HttpdClient.cxx b/src/output/HttpdClient.cxx
index 0d0e3c949..5ac3bf7cc 100644
--- a/src/output/HttpdClient.cxx
+++ b/src/output/HttpdClient.cxx
@@ -22,7 +22,7 @@
#include "HttpdInternal.hxx"
#include "util/fifo_buffer.h"
#include "page.h"
-#include "icy_server.h"
+#include "IcyMetaDataServer.hxx"
#include "glib_socket.h"
#include <assert.h>
diff --git a/src/output/HttpdOutputPlugin.cxx b/src/output/HttpdOutputPlugin.cxx
index c6367cd21..52b2e0e8d 100644
--- a/src/output/HttpdOutputPlugin.cxx
+++ b/src/output/HttpdOutputPlugin.cxx
@@ -26,7 +26,7 @@
#include "encoder_list.h"
#include "resolver.h"
#include "page.h"
-#include "icy_server.h"
+#include "IcyMetaDataServer.hxx"
#include "fd_util.h"
#include "ServerSocket.hxx"
#include "Main.hxx"