aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins/mp3_plugin.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/inputPlugins/mp3_plugin.c')
-rw-r--r--src/inputPlugins/mp3_plugin.c33
1 files changed, 8 insertions, 25 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index b20118da4..9434489bc 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -850,26 +850,15 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
sample = (mpd_sint16 *) data->outputPtr;
*sample = (mpd_sint16) audio_linear_dither(16,
- (data->
- synth).pcm.
- samples[0]
- [i],
- &(data->
- dither));
+ (data->synth).pcm.samples[0][i],
+ &(data->dither));
data->outputPtr += 2;
if (MAD_NCHANNELS(&(data->frame).header) == 2) {
sample = (mpd_sint16 *) data->outputPtr;
*sample = (mpd_sint16) audio_linear_dither(16,
- (data->
- synth).
- pcm.
- samples
- [1]
- [i],
- &
- (data->
- dither));
+ (data->synth).pcm.samples[1][i],
+ &(data->dither));
data->outputPtr += 2;
}
@@ -878,18 +867,12 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
ret = sendDataToOutputBuffer(cb,
data->inStream,
dc,
- data->inStream->
- seekable,
- data->outputBuffer,
- data->outputPtr -
+ data->inStream->seekable,
data->outputBuffer,
+ data->outputPtr - data->outputBuffer,
data->elapsedTime,
- data->bitRate /
- 1000,
- (replayGainInfo !=
- NULL) ?
- *replayGainInfo :
- NULL);
+ data->bitRate / 1000,
+ (replayGainInfo != NULL) ? *replayGainInfo : NULL);
if (ret == OUTPUT_BUFFER_DC_STOP) {
data->flush = 0;
return DECODE_BREAK;