aboutsummaryrefslogtreecommitdiffstats
path: root/src
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
commit4a87f1e8159c5d26cba08b895b8c4eb5251cf4ba (patch)
tree242e516288e35f01b417b34e96bc3ef036d77634 /src
parentd186260016581a76205be6b34279a6c2a4a7dee4 (diff)
downloadmpd-4a87f1e8159c5d26cba08b895b8c4eb5251cf4ba.tar.gz
mpd-4a87f1e8159c5d26cba08b895b8c4eb5251cf4ba.tar.xz
mpd-4a87f1e8159c5d26cba08b895b8c4eb5251cf4ba.zip
remove one indent level from audiofile plugin
Anonymous code blocks just to declare variables look ugly. Move the variable declarations up and disband the code block.
Diffstat (limited to 'src')
-rw-r--r--src/inputPlugins/audiofile_plugin.c55
1 files changed, 25 insertions, 30 deletions
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index 6db342f82..6b8e4e2bd 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -49,6 +49,8 @@ static int audiofile_decode(struct decoder * decoder, char *path)
float total_time;
mpd_uint16 bitRate;
struct stat st;
+ int ret, current = 0;
+ char chunk[CHUNK_SIZE];
if (stat(path, &st) < 0) {
ERROR("failed to stat: %s\n", path);
@@ -87,36 +89,29 @@ static int audiofile_decode(struct decoder * decoder, char *path)
decoder_initialized(decoder, &audio_format, total_time);
- {
- int ret, current = 0;
- char chunk[CHUNK_SIZE];
-
- do {
- if (dc.command == DECODE_COMMAND_SEEK) {
- decoder_clear(decoder);
- current = dc.seekWhere *
- audio_format.sampleRate;
- afSeekFrame(af_fp, AF_DEFAULT_TRACK, current);
- dc_command_finished();
- }
-
- ret =
- afReadFrames(af_fp, AF_DEFAULT_TRACK, chunk,
- CHUNK_SIZE / fs);
- if (ret <= 0)
-
- current += ret;
- decoder_data(decoder, NULL,
- 1,
- chunk, ret * fs,
- (float)current /
- (float)audio_format.
- sampleRate, bitRate,
- NULL);
- } while (dc.command != DECODE_COMMAND_STOP);
-
- decoder_flush(decoder);
- }
+ do {
+ if (dc.command == DECODE_COMMAND_SEEK) {
+ decoder_clear(decoder);
+ current = dc.seekWhere *
+ audio_format.sampleRate;
+ afSeekFrame(af_fp, AF_DEFAULT_TRACK, current);
+ dc_command_finished();
+ }
+
+ ret = afReadFrames(af_fp, AF_DEFAULT_TRACK, chunk,
+ CHUNK_SIZE / fs);
+ if (ret <= 0)
+ break;
+
+ current += ret;
+ decoder_data(decoder, NULL, 1,
+ chunk, ret * fs,
+ (float)current / (float)audio_format.sampleRate,
+ bitRate, NULL);
+ } while (dc.command != DECODE_COMMAND_STOP);
+
+ decoder_flush(decoder);
+
afCloseFile(af_fp);
return 0;