diff options
| author | Max Kellermann <max@duempel.org> | 2009-01-01 18:36:47 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-01-01 18:36:47 +0100 |
| commit | ecb20c5f7e728693bcb67981fdde44832f1ed028 (patch) | |
| tree | 89a3b2d53b51ccf7110eee8608b624b1e3074cf3 /src | |
| parent | 65f037eb323c5229e6655da4f562f7a98fd30eee (diff) | |
| download | mpd-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')
| -rw-r--r-- | src/mixer/alsa_mixer.c | 4 | ||||
| -rw-r--r-- | src/mixer/oss_mixer.c | 4 | ||||
| -rw-r--r-- | src/volume.c | 4 |
3 files changed, 6 insertions, 6 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; } diff --git a/src/volume.c b/src/volume.c index e41d1d0e1..3ba0355e6 100644 --- a/src/volume.c +++ b/src/volume.c @@ -57,12 +57,12 @@ mixer_reconfigure(char *driver) param = getConfigParam(CONF_MIXER_DEVICE); if (param) { g_warning("deprecated option mixer_device found, translating to %s config section\n", driver); - addBlockParam(newparam, "mix_device", param->value, -1); + addBlockParam(newparam, "mixer_device", param->value, -1); } param = getConfigParam(CONF_MIXER_CONTROL); if (param) { g_warning("deprecated option mixer_control found, translating to %s config section\n", driver); - addBlockParam(newparam, "mix_control", param->value, -1); + addBlockParam(newparam, "mixer_control", param->value, -1); } if (newparam->numberOfBlockParams > 0) { //call configure method of corrensponding mixer |