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

aac: simplified fillAacBuffer()

Browse Source 
Return instead of putting all the code into a if-closure.  That saves
one level of indentation.
This commit is contained in:
Max Kellermann 2008-08-26 08:27:10 +02:00
parent 1d18f0089a
commit 2a14141121
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/inputPlugins/aac_plugin.c
View File

@ -39,43 +39,35 @@ typedef struct {
static void fillAacBuffer(AacBuffer * b) static void fillAacBuffer(AacBuffer * b)
{ {
if (b->bytesConsumed > 0) { size_t bread;
size_t bread;
if (b->bytesIntoBuffer) { if (b->bytesConsumed == 0)
memmove((void *)b->buffer, (void *)(b->buffer + return;
b->bytesConsumed),
b->bytesIntoBuffer);
}
if (!b->atEof) { if (b->bytesIntoBuffer) {
bread = readFromInputStream(b->inStream, memmove((void *)b->buffer, (void *)(b->buffer +
(void *)(b->buffer + b->bytesConsumed),
b-> b->bytesIntoBuffer);
bytesIntoBuffer),
1, b->bytesConsumed);
if (bread != b->bytesConsumed)
b->atEof = 1;
b->bytesIntoBuffer += bread;
}
b->bytesConsumed = 0;
if (b->bytesIntoBuffer > 3) {
if (memcmp(b->buffer, "TAG", 3) == 0)
b->bytesIntoBuffer = 0;
}
if (b->bytesIntoBuffer > 11) {
if (memcmp(b->buffer, "LYRICSBEGIN", 11) == 0) {
b->bytesIntoBuffer = 0;
}
}
if (b->bytesIntoBuffer > 8) {
if (memcmp(b->buffer, "APETAGEX", 8) == 0) {
b->bytesIntoBuffer = 0;
}
}
} }
if (!b->atEof) {
bread = readFromInputStream(b->inStream,
(void *)(b->buffer +
b->
bytesIntoBuffer),
1, b->bytesConsumed);
if (bread != b->bytesConsumed)
b->atEof = 1;
b->bytesIntoBuffer += bread;
}
b->bytesConsumed = 0;
if ((b->bytesIntoBuffer > 3 && memcmp(b->buffer, "TAG", 3) == 0) ||
(b->bytesIntoBuffer > 11 &&
memcmp(b->buffer, "LYRICSBEGIN", 11) == 0) ||
(b->bytesIntoBuffer > 8 && memcmp(b->buffer, "APETAGEX", 8) == 0))
b->bytesIntoBuffer = 0;
} }
static void advanceAacBuffer(AacBuffer * b, size_t bytes) static void advanceAacBuffer(AacBuffer * b, size_t bytes)