oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

icy_server: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-30 09:08:50 +01:00
parent f8ff45b212
commit 718fd97612
5 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -81,7 +81,6 @@ mpd_headers = \
src/decoder/pcm_decoder_plugin.h \ src/decoder/pcm_decoder_plugin.h \
src/input_stream.h \ src/input_stream.h \
src/text_input_stream.h \ src/text_input_stream.h \
src/icy_server.h \
src/ls.h \ src/ls.h \
src/mixer_api.h \ src/mixer_api.h \
src/mixer_control.h \ src/mixer_control.h \
@ -889,7 +888,7 @@ endif
if ENABLE_HTTPD_OUTPUT if ENABLE_HTTPD_OUTPUT
liboutput_plugins_a_SOURCES += \ liboutput_plugins_a_SOURCES += \
src/icy_server.c \ src/IcyMetaDataServer.cxx src/IcyMetaDataServer.hxx \
src/output/HttpdInternal.hxx \ src/output/HttpdInternal.hxx \
src/output/HttpdClient.cxx src/output/HttpdClient.hxx \ src/output/HttpdClient.cxx src/output/HttpdClient.hxx \
src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx src/output/HttpdOutputPlugin.cxx src/output/HttpdOutputPlugin.hxx

6
src/icy_server.c → src/IcyMetaDataServer.cxx
View File

@ -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 * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,9 @@
*/ */
#include "config.h" #include "config.h"
#include "icy_server.h" #include "IcyMetaDataServer.hxx"
#include "page.h"
#include "tag.h"
#include <glib.h> #include <glib.h>

15
src/icy_server.h → src/IcyMetaDataServer.hxx
View File

@ -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 * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * 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. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef ICY_SERVER_H #ifndef MPD_ICY_META_DATA_SERVER_HXX
#define ICY_SERVER_H #define MPD_ICY_META_DATA_SERVER_HXX
#include "page.h"
#include "tag.h" #include "tag.h"
#ifdef __cplusplus
extern "C" {
#endif
char* char*
icy_server_metadata_header(const char *name, icy_server_metadata_header(const char *name,
const char *genre, const char *url, const char *genre, const char *url,
@ -35,8 +30,4 @@ icy_server_metadata_header(const char *name,
struct page* struct page*
icy_server_metadata_page(const struct tag *tag, const enum tag_type *types); icy_server_metadata_page(const struct tag *tag, const enum tag_type *types);
#ifdef __cplusplus
}
#endif
#endif #endif

2
src/output/HttpdClient.cxx
View File

@ -22,7 +22,7 @@
#include "HttpdInternal.hxx" #include "HttpdInternal.hxx"
#include "util/fifo_buffer.h" #include "util/fifo_buffer.h"
#include "page.h" #include "page.h"
#include "icy_server.h" #include "IcyMetaDataServer.hxx"
#include "glib_socket.h" #include "glib_socket.h"
#include <assert.h> #include <assert.h>

2
src/output/HttpdOutputPlugin.cxx
View File

@ -26,7 +26,7 @@
#include "encoder_list.h" #include "encoder_list.h"
#include "resolver.h" #include "resolver.h"
#include "page.h" #include "page.h"
#include "icy_server.h" #include "IcyMetaDataServer.hxx"
#include "fd_util.h" #include "fd_util.h"
#include "ServerSocket.hxx" #include "ServerSocket.hxx"
#include "Main.hxx" #include "Main.hxx"