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

8
doc/mpd.conf.5
View File

@@ -166,13 +166,13 @@ and mixer_control will apply.
.B mixer_device <mixer dev> .B mixer_device <mixer dev>
This specifies which mixer to use. The default for oss is "/dev/mixer"; the 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 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 .TP
.B mixer_control <mixer ctrl> .B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the This specifies which mixer control to use (sometimes referred to as the
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example "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 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. output device instead.
.TP .TP
.B replaygain <album or track> .B replaygain <album or track>
@@ -281,11 +281,11 @@ whatever audio format is passed to the audio output.
.B device <dev> .B device <dev>
This specifies the device to use for audio output. The default is "default". This specifies the device to use for audio output. The default is "default".
.TP .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 This specifies which mixer to use. The default for oss is "/dev/mixer"; the
default for alsa is "default". default for alsa is "default".
.TP .TP
.B mix_control <mixer ctrl> .B mixer_control <mixer ctrl>
This specifies which mixer control to use (sometimes referred to as the This specifies which mixer control to use (sometimes referred to as the
"device"). Examples of mixer controls are PCM, Line1, Master, etc. An example "device"). Examples of mixer controls are PCM, Line1, Master, etc. An example
for OSS is "Pcm", and an example for alsa is "PCM". for OSS is "Pcm", and an example for alsa is "PCM".

8
doc/mpdconf.example
View File

@@ -162,8 +162,8 @@ log_file "~/.mpd/log"
# name "My ALSA Device" # name "My ALSA Device"
# device "hw:0,0" # optional # device "hw:0,0" # optional
# format "44100:16:2" # optional # format "44100:16:2" # optional
# mix_device "default" # optional # mixer_device "default" # optional
# mix_control "PCM" # optional # mixer_control "PCM" # optional
#} #}
# #
# An example of an OSS output: # An example of an OSS output:
@@ -173,8 +173,8 @@ log_file "~/.mpd/log"
# name "My OSS Device" # name "My OSS Device"
# device "/dev/dsp" # optional # device "/dev/dsp" # optional
# format "44100:16:2" # optional # format "44100:16:2" # optional
# mix_device "/dev/mixer" # optional # mixer_device "/dev/mixer" # optional
# mix_control "PCM" # optional # mixer_control "PCM" # optional
#} #}
# #
# An example of a shout output (for streaming to Icecast): # An example of a shout output (for streaming to Icecast):

4
src/mixer/alsa_mixer.c
View File

@@ -43,9 +43,9 @@ alsa_mixer_configure(struct alsa_mixer *am, ConfigParam *param)
{ {
BlockParam *bp; BlockParam *bp;
if ((bp = getBlockParam(param, "mix_device"))) if ((bp = getBlockParam(param, "mixer_device")))
am->device = bp->value; am->device = bp->value;
if ((bp = getBlockParam(param, "mix_control"))) if ((bp = getBlockParam(param, "mixer_control")))
am->control = bp->value; 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) oss_mixer_configure(struct oss_mixer *om, ConfigParam *param)
{ {
BlockParam *bp; BlockParam *bp;
bp = getBlockParam(param, "mix_device"); bp = getBlockParam(param, "mixer_device");
if (bp) { if (bp) {
om->device = bp->value; om->device = bp->value;
} }
bp = getBlockParam(param, "mix_control"); bp = getBlockParam(param, "mixer_control");
if (bp) { if (bp) {
om->control = bp->value; om->control = bp->value;
} }

4
src/volume.c
View File

@@ -57,12 +57,12 @@ mixer_reconfigure(char *driver)
param = getConfigParam(CONF_MIXER_DEVICE); param = getConfigParam(CONF_MIXER_DEVICE);
if (param) { if (param) {
g_warning("deprecated option mixer_device found, translating to %s config section\n", driver); 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); param = getConfigParam(CONF_MIXER_CONTROL);
if (param) { if (param) {
g_warning("deprecated option mixer_control found, translating to %s config section\n", driver); 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) { if (newparam->numberOfBlockParams > 0) {
//call configure method of corrensponding mixer //call configure method of corrensponding mixer