diff options
| author | Avuton Olrich <avuton@gmail.com> | 2009-02-26 09:13:07 -0800 |
|---|---|---|
| committer | Avuton Olrich <avuton@gmail.com> | 2009-02-26 09:13:07 -0800 |
| commit | 90ee488597534179cd5dce68d84ba1e23569f681 (patch) | |
| tree | 42b35f1aa206c2ddd4c08d65e35c09baaae8dd48 | |
| parent | 1b79449ef13086790082eec18e9a25f784a6dc00 (diff) | |
| download | mpd-90ee488597534179cd5dce68d84ba1e23569f681.tar.gz mpd-90ee488597534179cd5dce68d84ba1e23569f681.tar.xz mpd-90ee488597534179cd5dce68d84ba1e23569f681.zip | |
mixer: Add "disabled" mixer_type.
Diffstat (limited to '')
| -rw-r--r-- | doc/mpd.conf.5 | 2 | ||||
| -rw-r--r-- | doc/mpdconf.example | 4 | ||||
| -rw-r--r-- | src/volume.c | 3 | ||||
| -rw-r--r-- | src/volume.h | 1 |
4 files changed, 9 insertions, 1 deletions
diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index e375de195..592398a10 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -163,7 +163,7 @@ Linear interpolator, very fast, poor quality. For an up-to-date list of available converters, please see the libsamplerate documentation (available online at <\fBhttp://www.mega-nerd.com/SRC/\fP>). .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 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 diff --git a/doc/mpdconf.example b/doc/mpdconf.example index ba9a74ef6..5b19c028c 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -245,6 +245,10 @@ log_file "~/.mpd/log" # #mixer_type "software" # +# This example will not allow MPD to touch the mixer at all. +# +#mixer_type "disabled" +# ############################################################################### diff --git a/src/volume.c b/src/volume.c index 501791016..c5c1e83b2 100644 --- a/src/volume.c +++ b/src/volume.c @@ -36,6 +36,7 @@ #define VOLUME_MIXER_TYPE_SOFTWARE 0 #define VOLUME_MIXER_TYPE_HARDWARE 1 +#define VOLUME_MIXER_TYPE_DISABLED 2 #define VOLUME_MIXER_SOFTWARE_DEFAULT "" #define SW_VOLUME_STATE "sw_volume: " @@ -131,6 +132,8 @@ void volume_init(void) if (param) { if (strcmp(param->value, VOLUME_MIXER_SOFTWARE) == 0) { 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) { //nothing to do } else { diff --git a/src/volume.h b/src/volume.h index fbf86df89..950f26e7a 100644 --- a/src/volume.h +++ b/src/volume.h @@ -25,6 +25,7 @@ #define VOLUME_MIXER_ALSA "alsa" #define VOLUME_MIXER_SOFTWARE "software" #define VOLUME_MIXER_HARDWARE "hardware" +#define VOLUME_MIXER_DISABLED "disabled" void volume_init(void); |