From ecb20c5f7e728693bcb67981fdde44832f1ed028 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 1 Jan 2009 18:36:47 +0100 Subject: mixer: renamed mix_* options to mixer_* There is no reason to use the shortcut "mix" instead of "mixer". --- src/mixer/alsa_mixer.c | 4 ++-- src/mixer/oss_mixer.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mixer') 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; } -- cgit v1.2.3