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

replay_gain: optionally use hardware mixer to apply replay gain

Browse Source 
Add an option for each audio output which enables the use of the
hardware mixer, instead of the software volume code.

This is hardware specific, and assumes linear volume control.  This is
not the case for hardware mixers which were tested, making this patch
somewhat useless, but we will use it to experiment with the settings,
to find a good solution.
This commit is contained in:
Max Kellermann
2010-02-16 08:55:37 +01:00
parent 48b49e2303
commit 96493e0333
8 changed files with 116 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/output_init.c
View File

@@ -32,6 +32,7 @@
#include "filter_config.h"
#include "filter/chain_filter_plugin.h"
#include "filter/autoconvert_filter_plugin.h"
#include "filter/replay_gain_filter_plugin.h"
#include <glib.h>
@@ -196,12 +197,19 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
/* create the replay_gain filter */
ao->replay_gain_filter = filter_new(&replay_gain_filter_plugin,
param, NULL);
assert(ao->replay_gain_filter != NULL);
const char *replay_gain_handler =
config_get_block_string(param, "replay_gain_handler",
"software");
filter_chain_append(ao->filter, ao->replay_gain_filter);
ao->replay_gain_serial = 0;
if (strcmp(replay_gain_handler, "none") != 0) {
ao->replay_gain_filter = filter_new(&replay_gain_filter_plugin,
param, NULL);
assert(ao->replay_gain_filter != NULL);
filter_chain_append(ao->filter, ao->replay_gain_filter);
ao->replay_gain_serial = 0;
} else
ao->replay_gain_filter = NULL;
/* create the normalization filter (if configured) */
@@ -247,6 +255,21 @@ audio_output_init(struct audio_output *ao, const struct config_param *param,
g_error_free(error);
}
/* use the hardware mixer for replay gain? */
if (strcmp(replay_gain_handler, "mixer") == 0) {
if (ao->mixer != NULL)
replay_gain_filter_set_mixer(ao->replay_gain_filter,
ao->mixer, 100);
else
g_warning("No such mixer for output '%s'", ao->name);
} else if (strcmp(replay_gain_handler, "software") != 0 &&
ao->replay_gain_filter != NULL) {
g_set_error(error_r, audio_output_quark(), 0,
"Invalid \"replay_gain_handler\" value");
return false;
}
/* the "convert" filter must be the last one in the chain */
ao->convert_filter = filter_new(&convert_filter_plugin, NULL, NULL);