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

mixer_plugin: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-02-22 20:51:23 +01:00
parent 9ede4c5f3c
commit 496f70fc0d
28 changed files with 59 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile.am
View File

@ -75,11 +75,7 @@ mpd_headers = \
src/input_stream.h \ src/input_stream.h \
src/text_input_stream.h \ src/text_input_stream.h \
src/ls.h \ src/ls.h \
src/mixer_api.h \
src/mixer_control.h \
src/mixer_list.h \
src/mixer_plugin.h \ src/mixer_plugin.h \
src/mixer_type.h \
src/daemon.h \ src/daemon.h \
src/AudioCompress/config.h \ src/AudioCompress/config.h \
src/AudioCompress/compress.h \ src/AudioCompress/compress.h \
@ -798,10 +794,11 @@ MIXER_LIBS = \
$(PULSE_LIBS) $(PULSE_LIBS)
MIXER_API_SRC = \ MIXER_API_SRC = \
src/mixer_control.c \ src/MixerList.hxx \
src/mixer_type.c \ src/MixerControl.cxx src/MixerControl.hxx \
src/MixerType.cxx src/MixerType.hxx \
src/MixerAll.cxx src/MixerAll.hxx \ src/MixerAll.cxx src/MixerAll.hxx \
src/mixer_api.c src/MixerInternal.cxx src/MixerInternal.hxx
libmixer_plugins_a_SOURCES = \ libmixer_plugins_a_SOURCES = \
src/mixer/SoftwareMixerPlugin.cxx \ src/mixer/SoftwareMixerPlugin.cxx \
@ -1344,9 +1341,9 @@ test_run_output_SOURCES = test/run_output.cxx \
src/resolver.c \ src/resolver.c \
src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
src/OutputPlugin.cxx \ src/OutputPlugin.cxx \
src/mixer_api.c \ src/MixerInternal.cxx \
src/mixer_control.c \ src/MixerControl.cxx \
src/mixer_type.c \ src/MixerType.cxx \
src/FilterPlugin.cxx \ src/FilterPlugin.cxx \
src/FilterConfig.cxx \ src/FilterConfig.cxx \
src/AudioCompress/compress.c \ src/AudioCompress/compress.c \
@ -1363,7 +1360,8 @@ test_read_mixer_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.cxx \ test_read_mixer_SOURCES = test/read_mixer.cxx \
src/tokenizer.c src/utils.c src/string_util.c \ 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/FilterPlugin.cxx \
src/filter/VolumeFilterPlugin.cxx \ src/filter/VolumeFilterPlugin.cxx \
src/fd_util.c src/fd_util.c

5
src/MixerAll.cxx
View File

@ -19,13 +19,14 @@
#include "config.h" #include "config.h"
#include "MixerAll.hxx" #include "MixerAll.hxx"
#include "MixerControl.hxx"
#include "MixerInternal.hxx"
#include "MixerList.hxx"
#include "OutputAll.hxx" #include "OutputAll.hxx"
#include "PcmVolume.hxx" #include "PcmVolume.hxx"
extern "C" { extern "C" {
#include "mixer_control.h"
#include "output_internal.h" #include "output_internal.h"
#include "mixer_api.h"
} }
#include <glib.h> #include <glib.h>

6
src/mixer_control.c → src/MixerControl.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,8 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_control.h" #include "MixerControl.hxx"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include <assert.h> #include <assert.h>
#include <stddef.h> #include <stddef.h>

8
src/mixer_control.h → src/MixerControl.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
@ -22,13 +22,11 @@
* Functions which manipulate a #mixer object. * Functions which manipulate a #mixer object.
*/ */
#ifndef MPD_MIXER_CONTROL_H #ifndef MPD_MIXER_CONTROL_HXX
#define MPD_MIXER_CONTROL_H #define MPD_MIXER_CONTROL_HXX
#include "gerror.h" #include "gerror.h"
#include <stdbool.h>
struct mixer; struct mixer;
struct mixer_plugin; struct mixer_plugin;
struct config_param; struct config_param;

4
src/mixer_api.c → src/MixerInternal.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,7 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "mixer" #define G_LOG_DOMAIN "mixer"

18
src/mixer_api.h → src/MixerInternal.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,11 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_MIXER_H #ifndef MPD_MIXER_INTERNAL_HXX
#define MPD_MIXER_H #define MPD_MIXER_INTERNAL_HXX
#include "mixer_plugin.h" #include "MixerPlugin.hxx"
#include "mixer_list.h" #include "MixerList.hxx"
#include <glib.h> #include <glib.h>
@ -46,15 +46,7 @@ struct mixer {
bool failed; bool failed;
}; };
#ifdef __cplusplus
extern "C" {
#endif
void void
mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin); mixer_init(struct mixer *mixer, const struct mixer_plugin *plugin);
#ifdef __cplusplus
}
#endif
#endif #endif

6
src/mixer_list.h → src/MixerList.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
@ -22,8 +22,8 @@
* This header provides "extern" declarations for all mixer plugins. * This header provides "extern" declarations for all mixer plugins.
*/ */
#ifndef MPD_MIXER_LIST_H #ifndef MPD_MIXER_LIST_HXX
#define MPD_MIXER_LIST_H #define MPD_MIXER_LIST_HXX
extern const struct mixer_plugin software_mixer_plugin; extern const struct mixer_plugin software_mixer_plugin;
extern const struct mixer_plugin alsa_mixer_plugin; extern const struct mixer_plugin alsa_mixer_plugin;

8
src/mixer_plugin.h → src/MixerPlugin.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
@ -20,12 +20,12 @@
/** \file /** \file
* *
* This header declares the mixer_plugin class. It should not be * 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. * implementations.
*/ */
#ifndef MPD_MIXER_PLUGIN_H #ifndef MPD_MIXER_PLUGIN_HXX
#define MPD_MIXER_PLUGIN_H #define MPD_MIXER_PLUGIN_HXX
#include "gerror.h" #include "gerror.h"

4
src/mixer_type.c → src/MixerType.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,7 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_type.h" #include "MixerType.hxx"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

6
src/mixer_type.h → src/MixerType.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,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_MIXER_TYPE_H #ifndef MPD_MIXER_TYPE_HXX
#define MPD_MIXER_TYPE_H #define MPD_MIXER_TYPE_HXX
enum mixer_type { enum mixer_type {
/** parser error */ /** parser error */

2
src/OutputCommand.cxx
View File

@ -28,12 +28,12 @@
#include "OutputCommand.hxx" #include "OutputCommand.hxx"
#include "OutputAll.hxx" #include "OutputAll.hxx"
#include "PlayerControl.hxx" #include "PlayerControl.hxx"
#include "MixerControl.hxx"
#include "Idle.hxx" #include "Idle.hxx"
extern "C" { extern "C" {
#include "output_internal.h" #include "output_internal.h"
#include "output_plugin.h" #include "output_plugin.h"
#include "mixer_control.h"
} }
extern unsigned audio_output_state_version; extern unsigned audio_output_state_version;

4
src/OutputControl.cxx
View File

@ -24,10 +24,10 @@
extern "C" { extern "C" {
#include "output_internal.h" #include "output_internal.h"
#include "mixer_control.h"
#include "mixer_plugin.h"
} }
#include "MixerPlugin.hxx"
#include "MixerControl.hxx"
#include "notify.hxx" #include "notify.hxx"
#include "filter/ReplayGainFilterPlugin.hxx" #include "filter/ReplayGainFilterPlugin.hxx"
#include "FilterPlugin.hxx" #include "FilterPlugin.hxx"

2
src/OutputFinish.cxx
View File

@ -22,9 +22,9 @@
extern "C" { extern "C" {
#include "output_internal.h" #include "output_internal.h"
#include "output_plugin.h" #include "output_plugin.h"
#include "mixer_control.h"
} }
#include "MixerControl.hxx"
#include "FilterInternal.hxx" #include "FilterInternal.hxx"
#include <assert.h> #include <assert.h>

6
src/OutputInit.cxx
View File

@ -27,11 +27,11 @@
extern "C" { extern "C" {
#include "output_internal.h" #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 "mixer/SoftwareMixerPlugin.hxx"
#include "FilterPlugin.hxx" #include "FilterPlugin.hxx"
#include "FilterRegistry.hxx" #include "FilterRegistry.hxx"

2
src/filter/ReplayGainFilterPlugin.cxx
View File

@ -25,7 +25,7 @@
#include "audio_format.h" #include "audio_format.h"
#include "replay_gain_info.h" #include "replay_gain_info.h"
#include "replay_gain_config.h" #include "replay_gain_config.h"
#include "mixer_control.h" #include "MixerControl.hxx"
#include "PcmVolume.hxx" #include "PcmVolume.hxx"
extern "C" { extern "C" {

2
src/mixer/AlsaMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "output_api.h" #include "output_api.h"
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"
#include "Main.hxx" #include "Main.hxx"

2
src/mixer/OssMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "output_api.h" #include "output_api.h"
#include "fd_util.h" #include "fd_util.h"

2
src/mixer/PulseMixerPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "PulseMixerPlugin.h" #include "PulseMixerPlugin.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "output/pulse_output_plugin.h" #include "output/pulse_output_plugin.h"
#include "conf.h" #include "conf.h"
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"

2
src/mixer/RoarMixerPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "output_api.h" #include "output_api.h"
#include "output/RoarOutputPlugin.hxx" #include "output/RoarOutputPlugin.hxx"

2
src/mixer/SoftwareMixerPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "SoftwareMixerPlugin.hxx" #include "SoftwareMixerPlugin.hxx"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "FilterPlugin.hxx" #include "FilterPlugin.hxx"
#include "FilterRegistry.hxx" #include "FilterRegistry.hxx"
#include "filter/VolumeFilterPlugin.hxx" #include "filter/VolumeFilterPlugin.hxx"

2
src/mixer/WinmmMixerPlugin.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "mixer_api.h" #include "MixerInternal.hxx"
#include "output_api.h" #include "output_api.h"
#include "output/WinmmOutputPlugin.hxx" #include "output/WinmmOutputPlugin.hxx"

2
src/output/AlsaOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "AlsaOutputPlugin.hxx" #include "AlsaOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "MixerList.hxx"
#include "pcm_export.h" #include "pcm_export.h"
#include <glib.h> #include <glib.h>

2
src/output/OssOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "OssOutputPlugin.hxx" #include "OssOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "MixerList.hxx"
#include "fd_util.h" #include "fd_util.h"
#include <glib.h> #include <glib.h>

2
src/output/RoarOutputPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "config.h" #include "config.h"
#include "RoarOutputPlugin.hxx" #include "RoarOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "MixerList.hxx"
#include "thread/Mutex.hxx" #include "thread/Mutex.hxx"
#include <glib.h> #include <glib.h>

2
src/output/WinmmOutputPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "WinmmOutputPlugin.hxx" #include "WinmmOutputPlugin.hxx"
#include "output_api.h" #include "output_api.h"
#include "pcm_buffer.h" #include "pcm_buffer.h"
#include "mixer_list.h" #include "MixerList.hxx"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/output/pulse_output_plugin.c
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "pulse_output_plugin.h" #include "pulse_output_plugin.h"
#include "output_api.h" #include "output_api.h"
#include "mixer_list.h" #include "MixerList.hxx"
#include "mixer/PulseMixerPlugin.h" #include "mixer/PulseMixerPlugin.h"
#include <glib.h> #include <glib.h>

8
test/read_mixer.cxx
View File

@ -18,12 +18,8 @@
*/ */
#include "config.h" #include "config.h"
#include "MixerControl.hxx"
extern "C" { #include "MixerList.hxx"
#include "mixer_control.h"
#include "mixer_list.h"
}
#include "FilterRegistry.hxx" #include "FilterRegistry.hxx"
#include "PcmVolume.hxx" #include "PcmVolume.hxx"
#include "GlobalEvents.hxx" #include "GlobalEvents.hxx"

2
test/run_filter.cxx
View File

@ -25,7 +25,7 @@
#include "FilterPlugin.hxx" #include "FilterPlugin.hxx"
#include "FilterInternal.hxx" #include "FilterInternal.hxx"
#include "PcmVolume.hxx" #include "PcmVolume.hxx"
#include "mixer_control.h" #include "MixerControl.hxx"
#include "stdbin.h" #include "stdbin.h"
#include <glib.h> #include <glib.h>