From eb8922f3468fe664211911c49077a4e3442b7703 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 29 Jan 2013 17:23:58 +0100 Subject: test/{read_conf,run_filter}: convert to C++ --- src/filter/ReplayGainFilterPlugin.cxx | 2 +- src/filter_plugin.h | 8 ++++++++ src/mixer_control.h | 8 ++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index 1c2f40260..f4b1f92ee 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -25,11 +25,11 @@ #include "audio_format.h" #include "replay_gain_info.h" #include "replay_gain_config.h" +#include "mixer_control.h" extern "C" { #include "pcm_buffer.h" #include "pcm_volume.h" -#include "mixer_control.h" } #include diff --git a/src/filter_plugin.h b/src/filter_plugin.h index d45faee1f..ae14a245c 100644 --- a/src/filter_plugin.h +++ b/src/filter_plugin.h @@ -74,6 +74,10 @@ struct filter_plugin { GError **error_r); }; +#ifdef __cplusplus +extern "C" { +#endif + /** * Creates a new instance of the specified filter plugin. * @@ -147,4 +151,8 @@ filter_filter(struct filter *filter, const void *src, size_t src_size, size_t *dest_size_r, GError **error_r); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/mixer_control.h b/src/mixer_control.h index 307298e47..46219e5dd 100644 --- a/src/mixer_control.h +++ b/src/mixer_control.h @@ -33,6 +33,10 @@ struct mixer; struct mixer_plugin; struct config_param; +#ifdef __cplusplus +extern "C" { +#endif + struct mixer * mixer_new(const struct mixer_plugin *plugin, void *ao, const struct config_param *param, @@ -60,4 +64,8 @@ mixer_get_volume(struct mixer *mixer, GError **error_r); bool mixer_set_volume(struct mixer *mixer, unsigned volume, GError **error_r); +#ifdef __cplusplus +} +#endif + #endif -- cgit v1.2.3