diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-06 22:00:50 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-06 22:00:50 +0200 |
| commit | 0275690b5cd133f992e9e34d6c76eb134aef26bd (patch) | |
| tree | 3ce67839d522420ff7b99224cdc8892c86395036 /src/mixer_control.c | |
| parent | da8095db546544bb9fe3a455ef5742bfef9c2f4f (diff) | |
| download | mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.tar.gz mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.tar.xz mpd-0275690b5cd133f992e9e34d6c76eb134aef26bd.zip | |
output: use the software mixer plugin
Do all the software volume stuff inside each output thread, not in the
player thread. This allows one software mixer per output device, and
also allows the user to configure the mixer type (hardware or
software) for each audio output.
This moves the global "mixer_type" setting into the "audio_output"
section, deprecating the "mixer_enabled" flag.
Diffstat (limited to 'src/mixer_control.c')
| -rw-r--r-- | src/mixer_control.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/mixer_control.c b/src/mixer_control.c index a17885935..927a1276c 100644 --- a/src/mixer_control.c +++ b/src/mixer_control.c @@ -28,24 +28,11 @@ #undef G_LOG_DOMAIN #define G_LOG_DOMAIN "mixer" -static bool mixers_enabled = true; - -void -mixer_disable_all(void) -{ - g_debug("mixer api is disabled"); - mixers_enabled = false; -} - struct mixer * mixer_new(const struct mixer_plugin *plugin, const struct config_param *param) { struct mixer *mixer; - //mixers are disabled (by using software volume) - if (!mixers_enabled) { - return NULL; - } assert(plugin != NULL); mixer = plugin->init(param); |