aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2010-01-04 13:31:20 +0100
committerMax Kellermann <max@duempel.org>2010-01-04 20:54:01 +0100
commit0e183d3fa1f216729725127d868d66268e1a35d4 (patch)
tree63f14bdadec2e24104fa0fe957d2a30900e25385 /src/decoder_api.c
parentcd8f92c9285e9b3b460ff47d2f251bfabce544da (diff)
downloadmpd-0e183d3fa1f216729725127d868d66268e1a35d4.tar.gz
mpd-0e183d3fa1f216729725127d868d66268e1a35d4.tar.xz
mpd-0e183d3fa1f216729725127d868d66268e1a35d4.zip
replay_gain: refactor API, move code to replay_gain_state.c
The replay_gain_state struct holds the precalculated scale factor, which is removed from struct replay_gain_info.
Diffstat (limited to '')
-rw-r--r--src/decoder_api.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 5106b564f..8e1e22f9d 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -27,6 +27,7 @@
#include "buffer.h"
#include "pipe.h"
#include "chunk.h"
+#include "replay_gain_state.h"
#include <glib.h>
@@ -352,10 +353,10 @@ decoder_data(struct decoder *decoder,
/* apply replay gain or normalization */
- if (replay_gain_mode != REPLAY_GAIN_OFF)
- replay_gain_apply(decoder->replay_gain,
- dest, nbytes,
- &dc->out_audio_format);
+ replay_gain_state_set_mode(decoder->replay_gain,
+ replay_gain_mode);
+ replay_gain_state_apply(decoder->replay_gain,
+ dest, nbytes, &dc->out_audio_format);
/* expand the music pipe chunk */
@@ -425,10 +426,5 @@ decoder_replay_gain(struct decoder *decoder,
{
assert(decoder != NULL);
- if (decoder->replay_gain != NULL)
- replay_gain_info_free(decoder->replay_gain);
-
- decoder->replay_gain = replay_gain_info != NULL
- ? replay_gain_info_dup(replay_gain_info)
- : NULL;
+ replay_gain_state_set_info(decoder->replay_gain, replay_gain_info);
}