Cleaning up some damn near unreadable wrapping caused by indent.
git-svn-id: https://svn.musicpd.org/mpd/trunk@5148 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
5da19e5f78
commit
f158016d0e
@ -850,26 +850,15 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
|
|||||||
|
|
||||||
sample = (mpd_sint16 *) data->outputPtr;
|
sample = (mpd_sint16 *) data->outputPtr;
|
||||||
*sample = (mpd_sint16) audio_linear_dither(16,
|
*sample = (mpd_sint16) audio_linear_dither(16,
|
||||||
(data->
|
(data->synth).pcm.samples[0][i],
|
||||||
synth).pcm.
|
&(data->dither));
|
||||||
samples[0]
|
|
||||||
[i],
|
|
||||||
&(data->
|
|
||||||
dither));
|
|
||||||
data->outputPtr += 2;
|
data->outputPtr += 2;
|
||||||
|
|
||||||
if (MAD_NCHANNELS(&(data->frame).header) == 2) {
|
if (MAD_NCHANNELS(&(data->frame).header) == 2) {
|
||||||
sample = (mpd_sint16 *) data->outputPtr;
|
sample = (mpd_sint16 *) data->outputPtr;
|
||||||
*sample = (mpd_sint16) audio_linear_dither(16,
|
*sample = (mpd_sint16) audio_linear_dither(16,
|
||||||
(data->
|
(data->synth).pcm.samples[1][i],
|
||||||
synth).
|
&(data->dither));
|
||||||
pcm.
|
|
||||||
samples
|
|
||||||
[1]
|
|
||||||
[i],
|
|
||||||
&
|
|
||||||
(data->
|
|
||||||
dither));
|
|
||||||
data->outputPtr += 2;
|
data->outputPtr += 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -878,18 +867,12 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
|
|||||||
ret = sendDataToOutputBuffer(cb,
|
ret = sendDataToOutputBuffer(cb,
|
||||||
data->inStream,
|
data->inStream,
|
||||||
dc,
|
dc,
|
||||||
data->inStream->
|
data->inStream->seekable,
|
||||||
seekable,
|
|
||||||
data->outputBuffer,
|
|
||||||
data->outputPtr -
|
|
||||||
data->outputBuffer,
|
data->outputBuffer,
|
||||||
|
data->outputPtr - data->outputBuffer,
|
||||||
data->elapsedTime,
|
data->elapsedTime,
|
||||||
data->bitRate /
|
data->bitRate / 1000,
|
||||||
1000,
|
(replayGainInfo != NULL) ? *replayGainInfo : NULL);
|
||||||
(replayGainInfo !=
|
|
||||||
NULL) ?
|
|
||||||
*replayGainInfo :
|
|
||||||
NULL);
|
|
||||||
if (ret == OUTPUT_BUFFER_DC_STOP) {
|
if (ret == OUTPUT_BUFFER_DC_STOP) {
|
||||||
data->flush = 0;
|
data->flush = 0;
|
||||||
return DECODE_BREAK;
|
return DECODE_BREAK;
|
||||||
|
Loading…
Reference in New Issue
Block a user