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

MixerPlugin: pass config_param reference

Browse Source
This commit is contained in:
Max Kellermann
2013-08-04 13:43:36 +02:00
parent f54bcc1f16
commit a0beb5fa26
11 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mixer/AlsaMixerPlugin.cxx
View File

@@ -31,7 +31,7 @@
#define VOLUME_MIXER_ALSA_DEFAULT "default"
#define VOLUME_MIXER_ALSA_CONTROL_DEFAULT "PCM"
#define VOLUME_MIXER_ALSA_INDEX_DEFAULT 0
static constexpr unsigned VOLUME_MIXER_ALSA_INDEX_DEFAULT = 0;
class AlsaMixerMonitor final : private MultiSocketMonitor {
snd_mixer_t *const mixer;
@@ -61,7 +61,7 @@ class AlsaMixer final : public Mixer {
public:
AlsaMixer():Mixer(alsa_mixer_plugin) {}
void Configure(const config_param *param);
void Configure(const config_param &param);
bool Setup(GError **error_r);
bool Open(GError **error_r);
void Close();
@@ -138,18 +138,18 @@ alsa_mixer_elem_callback(G_GNUC_UNUSED snd_mixer_elem_t *elem, unsigned mask)
*/
inline void
AlsaMixer::Configure(const config_param *param)
AlsaMixer::Configure(const config_param &param)
{
device = config_get_block_string(param, "mixer_device",
VOLUME_MIXER_ALSA_DEFAULT);
control = config_get_block_string(param, "mixer_control",
VOLUME_MIXER_ALSA_CONTROL_DEFAULT);
index = config_get_block_unsigned(param, "mixer_index",
VOLUME_MIXER_ALSA_INDEX_DEFAULT);
device = param.GetBlockValue("mixer_device",
VOLUME_MIXER_ALSA_DEFAULT);
control = param.GetBlockValue("mixer_control",
VOLUME_MIXER_ALSA_CONTROL_DEFAULT);
index = param.GetBlockValue("mixer_index",
VOLUME_MIXER_ALSA_INDEX_DEFAULT);
}
static Mixer *
alsa_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param,
alsa_mixer_init(G_GNUC_UNUSED void *ao, const config_param &param,
G_GNUC_UNUSED GError **error_r)
{
AlsaMixer *am = new AlsaMixer();

10
src/mixer/OssMixerPlugin.cxx
View File

@@ -51,7 +51,7 @@ class OssMixer : public Mixer {
public:
OssMixer():Mixer(oss_mixer_plugin) {}
bool Configure(const config_param *param, GError **error_r);
bool Configure(const config_param &param, GError **error_r);
bool Open(GError **error_r);
void Close();
@@ -84,11 +84,11 @@ oss_find_mixer(const char *name)
}
inline bool
OssMixer::Configure(const config_param *param, GError **error_r)
OssMixer::Configure(const config_param &param, GError **error_r)
{
device = config_get_block_string(param, "mixer_device",
device = param.GetBlockValue("mixer_device",
VOLUME_MIXER_OSS_DEFAULT);
control = config_get_block_string(param, "mixer_control", NULL);
control = param.GetBlockValue("mixer_control");
if (control != NULL) {
volume_control = oss_find_mixer(control);
@@ -104,7 +104,7 @@ OssMixer::Configure(const config_param *param, GError **error_r)
}
static Mixer *
oss_mixer_init(G_GNUC_UNUSED void *ao, const struct config_param *param,
oss_mixer_init(G_GNUC_UNUSED void *ao, const config_param &param,
GError **error_r)
{
OssMixer *om = new OssMixer();

2
src/mixer/PulseMixerPlugin.cxx
View File

@@ -153,7 +153,7 @@ pulse_mixer_on_change(PulseMixer *pm,
}
static Mixer *
pulse_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param,
pulse_mixer_init(void *ao, gcc_unused const config_param &param,
GError **error_r)
{
PulseOutput *po = (PulseOutput *)ao;

2
src/mixer/RoarMixerPlugin.cxx
View File

@@ -34,7 +34,7 @@ struct RoarMixer final : public Mixer {
};
static Mixer *
roar_mixer_init(void *ao, gcc_unused const struct config_param *param,
roar_mixer_init(void *ao, gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new RoarMixer((RoarOutput *)ao);

2
src/mixer/SoftwareMixerPlugin.cxx
View File

@@ -51,7 +51,7 @@ struct SoftwareMixer final : public Mixer {
static Mixer *
software_mixer_init(gcc_unused void *ao,
gcc_unused const struct config_param *param,
gcc_unused const config_param &param,
gcc_unused GError **error_r)
{
return new SoftwareMixer();

2
src/mixer/WinmmMixerPlugin.cxx
View File

@@ -60,7 +60,7 @@ winmm_volume_encode(int volume)
}
static Mixer *
winmm_mixer_init(void *ao, G_GNUC_UNUSED const struct config_param *param,
winmm_mixer_init(void *ao, gcc_unused const config_param &param,
G_GNUC_UNUSED GError **error_r)
{
assert(ao != nullptr);