aboutsummaryrefslogtreecommitdiffstats
path: root/src/mixer
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-01 18:36:47 +0100
committerMax Kellermann <max@duempel.org>2009-01-01 18:36:47 +0100
commitecb20c5f7e728693bcb67981fdde44832f1ed028 (patch)
tree89a3b2d53b51ccf7110eee8608b624b1e3074cf3 /src/mixer
parent65f037eb323c5229e6655da4f562f7a98fd30eee (diff)
downloadmpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.tar.gz
mpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.tar.xz
mpd-ecb20c5f7e728693bcb67981fdde44832f1ed028.zip
mixer: renamed mix_* options to mixer_*
There is no reason to use the shortcut "mix" instead of "mixer".
Diffstat (limited to 'src/mixer')
-rw-r--r--src/mixer/alsa_mixer.c4
-rw-r--r--src/mixer/oss_mixer.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mixer/alsa_mixer.c b/src/mixer/alsa_mixer.c
index 506daf794..fa97211aa 100644
--- a/src/mixer/alsa_mixer.c
+++ b/src/mixer/alsa_mixer.c
@@ -43,9 +43,9 @@ alsa_mixer_configure(struct alsa_mixer *am, ConfigParam *param)
{
BlockParam *bp;
- if ((bp = getBlockParam(param, "mix_device")))
+ if ((bp = getBlockParam(param, "mixer_device")))
am->device = bp->value;
- if ((bp = getBlockParam(param, "mix_control")))
+ if ((bp = getBlockParam(param, "mixer_control")))
am->control = bp->value;
}
diff --git a/src/mixer/oss_mixer.c b/src/mixer/oss_mixer.c
index ca4027f75..f3030d212 100644
--- a/src/mixer/oss_mixer.c
+++ b/src/mixer/oss_mixer.c
@@ -53,11 +53,11 @@ void
oss_mixer_configure(struct oss_mixer *om, ConfigParam *param)
{
BlockParam *bp;
- bp = getBlockParam(param, "mix_device");
+ bp = getBlockParam(param, "mixer_device");
if (bp) {
om->device = bp->value;
}
- bp = getBlockParam(param, "mix_control");
+ bp = getBlockParam(param, "mixer_control");
if (bp) {
om->control = bp->value;
}