music_pipe: no CamelCase

Rename all variables and struct members.
This commit is contained in:
Max Kellermann
2008-11-02 16:57:16 +01:00
parent 8490c1b4cf
commit 5347cca29d
4 changed files with 29 additions and 29 deletions

View File

@@ -58,9 +58,9 @@ void cross_fade_apply(struct music_chunk *a, const struct music_chunk *b,
assert(current_chunk <= num_chunks);
size = b->chunkSize > a->chunkSize
? a->chunkSize
: b->chunkSize;
size = b->length > a->length
? a->length
: b->length;
pcm_mix(a->data,
b->data,
@@ -68,14 +68,14 @@ void cross_fade_apply(struct music_chunk *a, const struct music_chunk *b,
format,
((float)current_chunk) / num_chunks);
if (b->chunkSize > a->chunkSize) {
if (b->length > a->length) {
/* the second buffer is larger than the first one:
there is unmixed rest at the end. Copy it over.
The output buffer API guarantees that there is
enough room in a->data. */
memcpy(a->data + a->chunkSize,
b->data + a->chunkSize,
b->chunkSize - a->chunkSize);
a->chunkSize = b->chunkSize;
memcpy(a->data + a->length,
b->data + a->length,
b->length - a->length);
a->length = b->length;
}
}