aboutsummaryrefslogtreecommitdiffstats
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
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 '')
-rw-r--r--doc/mpd.conf.58
-rw-r--r--doc/mpdconf.example8
-rw-r--r--src/mixer/alsa_mixer.c4
-rw-r--r--src/mixer/oss_mixer.c4
-rw-r--r--src/volume.c4
5 files changed, 14 insertions, 14 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5
index 935bd9b2f..cced775a7 100644
--- a/doc/mpd.conf.5
+++ b/doc/mpd.conf.5
@@ -166,13 +166,13 @@ and mixer_control will apply.
.B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the
default for alsa is "default". This option is deprecated and should not be
-used. Look at the mix_device option of corresponding output device instead.
+used. Look at the mixer_device option of corresponding output device instead.
.TP
.B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example
for OSS is "Pcm", and an example for alsa is "PCM". This option is deprecated
-and should not be used. Look at the mix_control option of corresponding
+and should not be used. Look at the mixer_control option of corresponding
output device instead.
.TP
.B replaygain <album or track>
@@ -281,11 +281,11 @@ whatever audio format is passed to the audio output.
.B device <dev>
This specifies the device to use for audio output. The default is "default".
.TP
-.B mix_device <mixer dev>
+.B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the
default for alsa is "default".
.TP
-.B mix_control <mixer ctrl>
+.B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example
for OSS is "Pcm", and an example for alsa is "PCM".
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 0b8004237..ba9a74ef6 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -162,8 +162,8 @@ log_file "~/.mpd/log"
# name "My ALSA Device"
# device "hw:0,0" # optional
# format "44100:16:2" # optional
-# mix_device "default" # optional
-# mix_control "PCM" # optional
+# mixer_device "default" # optional
+# mixer_control "PCM" # optional
#}
#
# An example of an OSS output:
@@ -173,8 +173,8 @@ log_file "~/.mpd/log"
# name "My OSS Device"
# device "/dev/dsp" # optional
# format "44100:16:2" # optional
-# mix_device "/dev/mixer" # optional
-# mix_control "PCM" # optional
+# mixer_device "/dev/mixer" # optional
+# mixer_control "PCM" # optional
#}
#
# An example of a shout output (for streaming to Icecast):
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