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

mixer: Add "disabled" mixer_type.

Browse Source
This commit is contained in:
Avuton Olrich 2009-02-26 09:13:07 -08:00
parent 1b79449ef1
commit 90ee488597
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/mpd.conf.5
View File

@ -163,7 +163,7 @@ Linear interpolator, very fast, poor quality.
For an up-to-date list of available converters, please see the libsamplerate For an up-to-date list of available converters, please see the libsamplerate
documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>). documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>).
.TP .TP
.B mixer_type <alsa, oss, software or hardware> .B mixer_type <alsa, oss, software, hardware or disabled>
This specifies which mixer to use. The default is hardware and depends on This specifies which mixer to use. The default is hardware and depends on
what audio output support mpd was built with. Options alsa and oss are what audio output support mpd was built with. Options alsa and oss are
legacy and should not be used in new configs, but when set mixer_device legacy and should not be used in new configs, but when set mixer_device

4
doc/mpdconf.example
View File

@ -245,6 +245,10 @@ log_file "~/.mpd/log"
# #
#mixer_type "software" #mixer_type "software"
# #
# This example will not allow MPD to touch the mixer at all.
#
#mixer_type "disabled"
#
############################################################################### ###############################################################################

3
src/volume.c
View File

@ -36,6 +36,7 @@
#define VOLUME_MIXER_TYPE_SOFTWARE 0 #define VOLUME_MIXER_TYPE_SOFTWARE 0
#define VOLUME_MIXER_TYPE_HARDWARE 1 #define VOLUME_MIXER_TYPE_HARDWARE 1
#define VOLUME_MIXER_TYPE_DISABLED 2
#define VOLUME_MIXER_SOFTWARE_DEFAULT "" #define VOLUME_MIXER_SOFTWARE_DEFAULT ""
#define SW_VOLUME_STATE "sw_volume: " #define SW_VOLUME_STATE "sw_volume: "
@ -131,6 +132,8 @@ void volume_init(void)
if (param) { if (param) {
if (strcmp(param->value, VOLUME_MIXER_SOFTWARE) == 0) { if (strcmp(param->value, VOLUME_MIXER_SOFTWARE) == 0) {
volume_mixer_type = VOLUME_MIXER_TYPE_SOFTWARE; volume_mixer_type = VOLUME_MIXER_TYPE_SOFTWARE;
} else if (strcmp(param->value, VOLUME_MIXER_DISABLED) == 0) {
volume_mixer_type = VOLUME_MIXER_TYPE_DISABLED;
} else if (strcmp(param->value, VOLUME_MIXER_HARDWARE) == 0) { } else if (strcmp(param->value, VOLUME_MIXER_HARDWARE) == 0) {
//nothing to do //nothing to do
} else { } else {

1
src/volume.h
View File

@ -25,6 +25,7 @@
#define VOLUME_MIXER_ALSA "alsa" #define VOLUME_MIXER_ALSA "alsa"
#define VOLUME_MIXER_SOFTWARE "software" #define VOLUME_MIXER_SOFTWARE "software"
#define VOLUME_MIXER_HARDWARE "hardware" #define VOLUME_MIXER_HARDWARE "hardware"
#define VOLUME_MIXER_DISABLED "disabled"
void volume_init(void); void volume_init(void);