diff options
author | Max Kellermann <max@duempel.org> | 2013-04-17 01:12:05 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-04-17 01:12:05 +0200 |
commit | 3a2254c91f19364d41aacea442c43b00aa1175e2 (patch) | |
tree | c6774b0203db2d5b536c5df8f3604d4d3431342f /src/output | |
parent | 4aeec4bb60f5f7635679ecbbee1f3e046901d640 (diff) | |
download | mpd-3a2254c91f19364d41aacea442c43b00aa1175e2.tar.gz mpd-3a2254c91f19364d41aacea442c43b00aa1175e2.tar.xz mpd-3a2254c91f19364d41aacea442c43b00aa1175e2.zip |
output: convert to C++
Diffstat (limited to '')
-rw-r--r-- | src/OutputInternal.hxx (renamed from src/output_internal.h) | 23 | ||||
-rw-r--r-- | src/OutputPlugin.hxx (renamed from src/output_plugin.h) | 14 | ||||
-rw-r--r-- | src/output/HttpdInternal.hxx | 2 | ||||
-rw-r--r-- | src/output_api.h | 4 |
4 files changed, 9 insertions, 34 deletions
diff --git a/src/output_internal.h b/src/OutputInternal.hxx index ed4188af0..dd7e5bc1d 100644 --- a/src/output_internal.h +++ b/src/OutputInternal.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,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_OUTPUT_INTERNAL_H -#define MPD_OUTPUT_INTERNAL_H +#ifndef MPD_OUTPUT_INTERNAL_HXX +#define MPD_OUTPUT_INTERNAL_HXX #include "audio_format.h" #include "pcm/pcm_buffer.h" @@ -27,12 +27,7 @@ #include <time.h> -#ifdef __cplusplus class Filter; -#else -typedef void *Filter; -#endif - struct config_param; enum audio_output_command { @@ -76,11 +71,7 @@ struct audio_output { * May be NULL if none is available, or if software volume is * configured. */ -#ifdef __cplusplus class Mixer *mixer; -#else - struct mixer *mixer; -#endif /** * Will this output receive tags from the decoder? The @@ -267,10 +258,6 @@ audio_output_command_is_finished(const struct audio_output *ao) return ao->command == AO_COMMAND_NONE; } -#ifdef __cplusplus -extern "C" { -#endif - struct audio_output * audio_output_new(const struct config_param *param, struct player_control *pc, @@ -287,8 +274,4 @@ ao_base_finish(struct audio_output *ao); void audio_output_free(struct audio_output *ao); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/output_plugin.h b/src/OutputPlugin.hxx index 2b71ba6a6..3839cd5b3 100644 --- a/src/output_plugin.h +++ b/src/OutputPlugin.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,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_OUTPUT_PLUGIN_H -#define MPD_OUTPUT_PLUGIN_H +#ifndef MPD_OUTPUT_PLUGIN_HXX +#define MPD_OUTPUT_PLUGIN_HXX #include "gcc.h" #include "gerror.h" @@ -166,10 +166,6 @@ ao_plugin_test_default_device(const struct audio_output_plugin *plugin) : false; } -#ifdef __cplusplus -extern "C" { -#endif - gcc_malloc struct audio_output * ao_plugin_init(const struct audio_output_plugin *plugin, @@ -212,8 +208,4 @@ ao_plugin_cancel(struct audio_output *ao); bool ao_plugin_pause(struct audio_output *ao); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/output/HttpdInternal.hxx b/src/output/HttpdInternal.hxx index 4b526bcde..e79b9a224 100644 --- a/src/output/HttpdInternal.hxx +++ b/src/output/HttpdInternal.hxx @@ -25,7 +25,7 @@ #ifndef MPD_OUTPUT_HTTPD_INTERNAL_H #define MPD_OUTPUT_HTTPD_INTERNAL_H -#include "output_internal.h" +#include "OutputInternal.hxx" #include "timer.h" #include "thread/Mutex.hxx" #include "event/ServerSocket.hxx" diff --git a/src/output_api.h b/src/output_api.h index dfeef3518..dee72d8db 100644 --- a/src/output_api.h +++ b/src/output_api.h @@ -20,8 +20,8 @@ #ifndef MPD_OUTPUT_API_H #define MPD_OUTPUT_API_H -#include "output_plugin.h" -#include "output_internal.h" +#include "OutputPlugin.hxx" +#include "OutputInternal.hxx" #include "audio_format.h" #include "tag.h" #include "conf.h" |