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.
This commit is contained in:
Max Kellermann
2010-01-04 13:31:20 +01:00
parent cd8f92c928
commit 0e183d3fa1
8 changed files with 209 additions and 76 deletions

View File

@@ -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);
}