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

mixer: renamed mix_* options to mixer_*

Browse Source 
There is no reason to use the shortcut "mix" instead of "mixer".
This commit is contained in:
Max Kellermann
2009-01-01 18:36:47 +01:00
parent 65f037eb32
commit ecb20c5f7e
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mixer/alsa_mixer.c
View File

@@ -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;
}

4
src/mixer/oss_mixer.c
View File

@@ -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;
}

4
src/volume.c
View File

@@ -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