icy_server: convert to C++

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

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>
 

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

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>

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"