aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder_api.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-08-26 08:27:06 +0200
committerMax Kellermann <max@duempel.org>2008-08-26 08:27:06 +0200
commit2e9169de9d859fd5d5629a4d1b3789155a5dac62 (patch)
tree3c4db7795105ebbd9651fd946b047bf642fc2590 /src/decoder_api.c
parent1b845f94a0a75bd6cc21ac666c9c0ab04362dd80 (diff)
downloadmpd-2e9169de9d859fd5d5629a4d1b3789155a5dac62.tar.gz
mpd-2e9169de9d859fd5d5629a4d1b3789155a5dac62.tar.xz
mpd-2e9169de9d859fd5d5629a4d1b3789155a5dac62.zip
moved convState to struct decoder
Since we moved all PCM conversions to decoder_data(), the attribute convState isn't being used anymore by the OutputBuffer code. Move it to struct decoder.
Diffstat (limited to '')
-rw-r--r--src/decoder_api.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/decoder_api.c b/src/decoder_api.c
index 2d79ab66b..7fab6678a 100644
--- a/src/decoder_api.c
+++ b/src/decoder_api.c
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "decoder_api.h"
+#include "decoder_internal.h"
#include "audio.h"
#include "utils.h"
@@ -25,12 +25,14 @@
#include "playerData.h"
#include "gcc.h"
-void decoder_initialized(mpd_unused struct decoder * decoder,
+void decoder_initialized(struct decoder * decoder,
const AudioFormat * audio_format,
float total_time)
{
assert(dc.state == DECODE_STATE_START);
+ memset(&decoder->conv_state, 0, sizeof(decoder->conv_state));
+
if (audio_format != NULL) {
dc.audioFormat = *audio_format;
getOutputAudioFormat(audio_format,
@@ -70,7 +72,7 @@ static int need_chunks(InputStream * inStream, int seekable)
return 0;
}
-int decoder_data(mpd_unused struct decoder *decoder, InputStream * inStream,
+int decoder_data(struct decoder *decoder, InputStream * inStream,
int seekable,
void *dataIn, size_t dataInLen,
float data_time, mpd_uint16 bitRate,
@@ -98,7 +100,7 @@ int decoder_data(mpd_unused struct decoder *decoder, InputStream * inStream,
data = convBuffer;
datalen = pcm_convertAudioFormat(&(dc.audioFormat), dataIn,
dataInLen, &(ob.audioFormat),
- data, &(ob.convState));
+ data, &decoder->conv_state);
}
if (replayGainInfo != NULL && (replayGainState != REPLAYGAIN_OFF))