oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mpc: get decoder command from decoder_data()

Browse Source 
Removed 3 superfluous decoder_get_command() invocations.
This commit is contained in:
Max Kellermann 2008-11-12 07:07:12 +01:00
parent 731e99c26e
commit 8d1ffb1684
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/decoder/mpc_plugin.c
View File

@ -123,6 +123,7 @@ mpc_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
mpc_uint32_t vbrUpdateBits; mpc_uint32_t vbrUpdateBits;
float total_time; float total_time;
struct replay_gain_info *replayGainInfo = NULL; struct replay_gain_info *replayGainInfo = NULL;
enum decoder_command cmd = DECODE_COMMAND_NONE;
data.inStream = inStream; data.inStream = inStream;
data.decoder = mpd_decoder; data.decoder = mpd_decoder;
@ -164,8 +165,8 @@ mpc_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
inStream->seekable, inStream->seekable,
mpc_streaminfo_get_length(&info)); mpc_streaminfo_get_length(&info));
while (true) { do {
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_SEEK) { if (cmd == DECODE_COMMAND_SEEK) {
samplePos = decoder_seek_where(mpd_decoder) * samplePos = decoder_seek_where(mpd_decoder) *
audio_format.sample_rate; audio_format.sample_rate;
if (mpc_decoder_seek_sample(&decoder, samplePos)) if (mpc_decoder_seek_sample(&decoder, samplePos))
@ -178,8 +179,7 @@ mpc_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
vbrUpdateBits = 0; vbrUpdateBits = 0;
ret = mpc_decoder_decode(&decoder, sample_buffer, ret = mpc_decoder_decode(&decoder, sample_buffer,
&vbrUpdateAcc, &vbrUpdateBits); &vbrUpdateAcc, &vbrUpdateBits);
if (ret <= 0)
if (ret <= 0 || decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break; break;
samplePos += ret; samplePos += ret;
@ -193,14 +193,11 @@ mpc_decode(struct decoder *mpd_decoder, struct input_stream *inStream)
bitRate = vbrUpdateBits * audio_format.sample_rate bitRate = vbrUpdateBits * audio_format.sample_rate
/ 1152 / 1000; / 1152 / 1000;
decoder_data(mpd_decoder, inStream, cmd = decoder_data(mpd_decoder, inStream,
chunk, ret * sizeof(chunk[0]), chunk, ret * sizeof(chunk[0]),
total_time, total_time,
bitRate, replayGainInfo); bitRate, replayGainInfo);
} while (cmd != DECODE_COMMAND_STOP);
if (decoder_get_command(mpd_decoder) == DECODE_COMMAND_STOP)
break;
}
replay_gain_info_free(replayGainInfo); replay_gain_info_free(replayGainInfo);
} }