diff options
28 files changed, 59 insertions, 74 deletions
diff --git a/Makefile.am b/Makefile.am index 71d2c5ec6..2e3029297 100644 --- a/Makefile.am +++ b/Makefile.am @@ -75,11 +75,7 @@ mpd_headers = \ src/input_stream.h \ src/text_input_stream.h \ src/ls.h \ - src/mixer_api.h \ - src/mixer_control.h \ - src/mixer_list.h \ src/mixer_plugin.h \ - src/mixer_type.h \ src/daemon.h \ src/AudioCompress/config.h \ src/AudioCompress/compress.h \ @@ -798,10 +794,11 @@ MIXER_LIBS = \ $(PULSE_LIBS) MIXER_API_SRC = \ - src/mixer_control.c \ - src/mixer_type.c \ + src/MixerList.hxx \ + src/MixerControl.cxx src/MixerControl.hxx \ + src/MixerType.cxx src/MixerType.hxx \ src/MixerAll.cxx src/MixerAll.hxx \ - src/mixer_api.c + src/MixerInternal.cxx src/MixerInternal.hxx libmixer_plugins_a_SOURCES = \ src/mixer/SoftwareMixerPlugin.cxx \ @@ -1344,9 +1341,9 @@ test_run_output_SOURCES = test/run_output.cxx \ src/resolver.c \ src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ src/OutputPlugin.cxx \ - src/mixer_api.c \ - src/mixer_control.c \ - src/mixer_type.c \ + src/MixerInternal.cxx \ + src/MixerControl.cxx \ + src/MixerType.cxx \ src/FilterPlugin.cxx \ src/FilterConfig.cxx \ src/AudioCompress/compress.c \ @@ -1363,7 +1360,8 @@ test_read_mixer_LDADD = \ $(GLIB_LIBS) test_read_mixer_SOURCES = test/read_mixer.cxx \ src/tokenizer.c src/utils.c src/string_util.c \ - src/mixer_control.c src/mixer_api.c \ + src/MixerControl.cxx \ + src/MixerInternal.cxx \ src/FilterPlugin.cxx \ src/filter/VolumeFilterPlugin.cxx \ src/fd_util.c diff --git a/src/MixerAll.cxx b/src/MixerAll.cxx index b38005520..00343a1a0 100644 --- a/src/MixerAll.cxx +++ b/src/MixerAll.cxx @@ -19,13 +19,14 @@ #include "config.h" #include "MixerAll.hxx" +#include "MixerControl.hxx" +#include "MixerInternal.hxx" +#include "MixerList.hxx" #include "OutputAll.hxx" #include "PcmVolume.hxx" extern "C" { -#include "mixer_control.h" #include "output_internal.h" -#include "mixer_api.h" } #include <glib.h> diff --git a/src/mixer_control.c b/src/MixerControl.cxx index 3e984dd04..4ca1c76ec 100644 --- a/src/mixer_control.c +++ b/src/MixerControl.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,8 +18,8 @@ */ #include "config.h" -#include "mixer_control.h" -#include "mixer_api.h" +#include "MixerControl.hxx" +#include "MixerInternal.hxx" #include <assert.h> #include <stddef.h> diff --git a/src/mixer_control.h b/src/MixerControl.hxx index 46219e5dd..ee1e959da 100644 --- a/src/mixer_control.h +++ b/src/MixerControl.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 @@ -22,13 +22,11 @@ * Functions which manipulate a #mixer object. */ -#ifndef MPD_MIXER_CONTROL_H -#define MPD_MIXER_CONTROL_H +#ifndef MPD_MIXER_CONTROL_HXX +#define MPD_MIXER_CONTROL_HXX #include "gerror.h" -#include <stdbool.h> - struct mixer; struct mixer_plugin; struct config_param; diff --git a/src/mixer_api.c b/src/MixerInternal.cxx index c85916c94..b8729fc7e 100644 --- a/src/mixer_api.c +++ b/src/MixerInternal.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,7 @@ */ #include "config.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "mixer" diff --git a/src/mixer_api.h b/src/MixerInternal.hxx index f0c9a0937..9c39e3e35 100644 --- a/src/mixer_api.h +++ b/src/MixerInternal.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,11 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_MIXER_H -#define MPD_MIXER_H +#ifndef MPD_MIXER_INTERNAL_HXX +#define MPD_MIXER_INTERNAL_HXX -#include "mixer_plugin.h" -#include "mixer_list.h" +#include "MixerPlugin.hxx" +#include "MixerList.hxx" #include <glib.h> @@ -46,15 +46,7 @@ struct mixer { bool failed; }; -#ifdef __cplusplus -extern "C" { -#endif - void mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin); -#ifdef __cplusplus -} -#endif - #endif diff --git a/src/mixer_list.h b/src/MixerList.hxx index 078358ec3..440f442ba 100644 --- a/src/mixer_list.h +++ b/src/MixerList.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 @@ -22,8 +22,8 @@ * This header provides "extern" declarations for all mixer plugins. */ -#ifndef MPD_MIXER_LIST_H -#define MPD_MIXER_LIST_H +#ifndef MPD_MIXER_LIST_HXX +#define MPD_MIXER_LIST_HXX extern const struct mixer_plugin software_mixer_plugin; extern const struct mixer_plugin alsa_mixer_plugin; diff --git a/src/mixer_plugin.h b/src/MixerPlugin.hxx index 2f3beed1d..1fbdfbbc2 100644 --- a/src/mixer_plugin.h +++ b/src/MixerPlugin.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 @@ -20,12 +20,12 @@ /** \file * * This header declares the mixer_plugin class. It should not be - * included directly; use mixer_api.h instead in mixer + * included directly; use MixerInternal.hxx instead in mixer * implementations. */ -#ifndef MPD_MIXER_PLUGIN_H -#define MPD_MIXER_PLUGIN_H +#ifndef MPD_MIXER_PLUGIN_HXX +#define MPD_MIXER_PLUGIN_HXX #include "gerror.h" diff --git a/src/mixer_type.c b/src/MixerType.cxx index a479caf16..435079790 100644 --- a/src/mixer_type.c +++ b/src/MixerType.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,7 @@ */ #include "config.h" -#include "mixer_type.h" +#include "MixerType.hxx" #include <assert.h> #include <string.h> diff --git a/src/mixer_type.h b/src/MixerType.hxx index 15d136b5b..320a36c04 100644 --- a/src/mixer_type.h +++ b/src/MixerType.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_MIXER_TYPE_H -#define MPD_MIXER_TYPE_H +#ifndef MPD_MIXER_TYPE_HXX +#define MPD_MIXER_TYPE_HXX enum mixer_type { /** parser error */ diff --git a/src/OutputCommand.cxx b/src/OutputCommand.cxx index be52b49a8..beb44f0ef 100644 --- a/src/OutputCommand.cxx +++ b/src/OutputCommand.cxx @@ -28,12 +28,12 @@ #include "OutputCommand.hxx" #include "OutputAll.hxx" #include "PlayerControl.hxx" +#include "MixerControl.hxx" #include "Idle.hxx" extern "C" { #include "output_internal.h" #include "output_plugin.h" -#include "mixer_control.h" } extern unsigned audio_output_state_version; diff --git a/src/OutputControl.cxx b/src/OutputControl.cxx index 37565082e..c451938f7 100644 --- a/src/OutputControl.cxx +++ b/src/OutputControl.cxx @@ -24,10 +24,10 @@ extern "C" { #include "output_internal.h" -#include "mixer_control.h" -#include "mixer_plugin.h" } +#include "MixerPlugin.hxx" +#include "MixerControl.hxx" #include "notify.hxx" #include "filter/ReplayGainFilterPlugin.hxx" #include "FilterPlugin.hxx" diff --git a/src/OutputFinish.cxx b/src/OutputFinish.cxx index 8b9480b88..559a5cf25 100644 --- a/src/OutputFinish.cxx +++ b/src/OutputFinish.cxx @@ -22,9 +22,9 @@ extern "C" { #include "output_internal.h" #include "output_plugin.h" -#include "mixer_control.h" } +#include "MixerControl.hxx" #include "FilterInternal.hxx" #include <assert.h> diff --git a/src/OutputInit.cxx b/src/OutputInit.cxx index 8c60fe4f1..de6869256 100644 --- a/src/OutputInit.cxx +++ b/src/OutputInit.cxx @@ -27,11 +27,11 @@ extern "C" { #include "output_internal.h" -#include "mixer_control.h" -#include "mixer_type.h" -#include "mixer_list.h" } +#include "MixerList.hxx" +#include "MixerType.hxx" +#include "MixerControl.hxx" #include "mixer/SoftwareMixerPlugin.hxx" #include "FilterPlugin.hxx" #include "FilterRegistry.hxx" diff --git a/src/filter/ReplayGainFilterPlugin.cxx b/src/filter/ReplayGainFilterPlugin.cxx index 13c8a4063..1fa2269b4 100644 --- a/src/filter/ReplayGainFilterPlugin.cxx +++ b/src/filter/ReplayGainFilterPlugin.cxx @@ -25,7 +25,7 @@ #include "audio_format.h" #include "replay_gain_info.h" #include "replay_gain_config.h" -#include "mixer_control.h" +#include "MixerControl.hxx" #include "PcmVolume.hxx" extern "C" { diff --git a/src/mixer/AlsaMixerPlugin.cxx b/src/mixer/AlsaMixerPlugin.cxx index 17f8b9a6f..d75016c00 100644 --- a/src/mixer/AlsaMixerPlugin.cxx +++ b/src/mixer/AlsaMixerPlugin.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "output_api.h" #include "GlobalEvents.hxx" #include "Main.hxx" diff --git a/src/mixer/OssMixerPlugin.cxx b/src/mixer/OssMixerPlugin.cxx index 490a65414..8d266b40a 100644 --- a/src/mixer/OssMixerPlugin.cxx +++ b/src/mixer/OssMixerPlugin.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "output_api.h" #include "fd_util.h" diff --git a/src/mixer/PulseMixerPlugin.cxx b/src/mixer/PulseMixerPlugin.cxx index 65dbc01fe..d7c6c8043 100644 --- a/src/mixer/PulseMixerPlugin.cxx +++ b/src/mixer/PulseMixerPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "PulseMixerPlugin.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "output/pulse_output_plugin.h" #include "conf.h" #include "GlobalEvents.hxx" diff --git a/src/mixer/RoarMixerPlugin.cxx b/src/mixer/RoarMixerPlugin.cxx index 2803203b7..a027f8570 100644 --- a/src/mixer/RoarMixerPlugin.cxx +++ b/src/mixer/RoarMixerPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "output_api.h" #include "output/RoarOutputPlugin.hxx" diff --git a/src/mixer/SoftwareMixerPlugin.cxx b/src/mixer/SoftwareMixerPlugin.cxx index 16463938f..6c287ea07 100644 --- a/src/mixer/SoftwareMixerPlugin.cxx +++ b/src/mixer/SoftwareMixerPlugin.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "SoftwareMixerPlugin.hxx" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "FilterPlugin.hxx" #include "FilterRegistry.hxx" #include "filter/VolumeFilterPlugin.hxx" diff --git a/src/mixer/WinmmMixerPlugin.cxx b/src/mixer/WinmmMixerPlugin.cxx index e3b7948e3..bf3155864 100644 --- a/src/mixer/WinmmMixerPlugin.cxx +++ b/src/mixer/WinmmMixerPlugin.cxx @@ -18,7 +18,7 @@ */ #include "config.h" -#include "mixer_api.h" +#include "MixerInternal.hxx" #include "output_api.h" #include "output/WinmmOutputPlugin.hxx" diff --git a/src/output/AlsaOutputPlugin.cxx b/src/output/AlsaOutputPlugin.cxx index 1badeb63d..c87c4cb99 100644 --- a/src/output/AlsaOutputPlugin.cxx +++ b/src/output/AlsaOutputPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "AlsaOutputPlugin.hxx" #include "output_api.h" -#include "mixer_list.h" +#include "MixerList.hxx" #include "pcm_export.h" #include <glib.h> diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index ace88b6f4..0111b13f6 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -20,7 +20,7 @@ #include "config.h" #include "OssOutputPlugin.hxx" #include "output_api.h" -#include "mixer_list.h" +#include "MixerList.hxx" #include "fd_util.h" #include <glib.h> diff --git a/src/output/RoarOutputPlugin.cxx b/src/output/RoarOutputPlugin.cxx index 43aeb09a2..9d6c45917 100644 --- a/src/output/RoarOutputPlugin.cxx +++ b/src/output/RoarOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "config.h" #include "RoarOutputPlugin.hxx" #include "output_api.h" -#include "mixer_list.h" +#include "MixerList.hxx" #include "thread/Mutex.hxx" #include <glib.h> diff --git a/src/output/WinmmOutputPlugin.cxx b/src/output/WinmmOutputPlugin.cxx index 7944e2bdd..b9652fc0b 100644 --- a/src/output/WinmmOutputPlugin.cxx +++ b/src/output/WinmmOutputPlugin.cxx @@ -21,7 +21,7 @@ #include "WinmmOutputPlugin.hxx" #include "output_api.h" #include "pcm_buffer.h" -#include "mixer_list.h" +#include "MixerList.hxx" #include <stdlib.h> #include <string.h> diff --git a/src/output/pulse_output_plugin.c b/src/output/pulse_output_plugin.c index 457fa9f04..e82d3d3fc 100644 --- a/src/output/pulse_output_plugin.c +++ b/src/output/pulse_output_plugin.c @@ -20,7 +20,7 @@ #include "config.h" #include "pulse_output_plugin.h" #include "output_api.h" -#include "mixer_list.h" +#include "MixerList.hxx" #include "mixer/PulseMixerPlugin.h" #include <glib.h> diff --git a/test/read_mixer.cxx b/test/read_mixer.cxx index 5cd9b2c52..45344a2f6 100644 --- a/test/read_mixer.cxx +++ b/test/read_mixer.cxx @@ -18,12 +18,8 @@ */ #include "config.h" - -extern "C" { -#include "mixer_control.h" -#include "mixer_list.h" -} - +#include "MixerControl.hxx" +#include "MixerList.hxx" #include "FilterRegistry.hxx" #include "PcmVolume.hxx" #include "GlobalEvents.hxx" diff --git a/test/run_filter.cxx b/test/run_filter.cxx index 09d755db2..9ea50ff55 100644 --- a/test/run_filter.cxx +++ b/test/run_filter.cxx @@ -25,7 +25,7 @@ #include "FilterPlugin.hxx" #include "FilterInternal.hxx" #include "PcmVolume.hxx" -#include "mixer_control.h" +#include "MixerControl.hxx" #include "stdbin.h" #include <glib.h> |