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

music_pipe: set bit_rate and time in music_pipe_append()

Browse Source 
Don't bother to pass these values as parameters to tail_chunk().
This commit is contained in:
Max Kellermann 2008-11-02 16:57:15 +01:00
parent cd61f6570f
commit 8490c1b4cf
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pipe.c
View File

@ -155,7 +155,7 @@ music_pipe_get_chunk(const unsigned i)
* room. * room.
*/ */
static struct music_chunk * static struct music_chunk *
tail_chunk(float data_time, uint16_t bitRate, size_t frame_size) tail_chunk(size_t frame_size)
{ {
unsigned int next; unsigned int next;
struct music_chunk *chunk; struct music_chunk *chunk;
@ -174,14 +174,6 @@ tail_chunk(float data_time, uint16_t bitRate, size_t frame_size)
assert(chunk->chunkSize == 0); assert(chunk->chunkSize == 0);
} }
if (chunk->chunkSize == 0) {
/* if the chunk is empty, nobody has set bitRate and
times yet */
chunk->bitRate = bitRate;
chunk->times = data_time;
}
return chunk; return chunk;
} }
@ -219,10 +211,18 @@ size_t music_pipe_append(const void *data0, size_t datalen,
assert((datalen % frame_size) == 0); assert((datalen % frame_size) == 0);
while (datalen) { while (datalen) {
chunk = tail_chunk(data_time, bitRate, frame_size); chunk = tail_chunk(frame_size);
if (chunk == NULL) if (chunk == NULL)
return ret; return ret;
if (chunk->chunkSize == 0) {
/* if the chunk is empty, nobody has set bitRate and
times yet */
chunk->bitRate = bitRate;
chunk->times = data_time;
}
nbytes = music_chunk_append(chunk, data, datalen, nbytes = music_chunk_append(chunk, data, datalen,
frame_size); frame_size);
assert(nbytes > 0); assert(nbytes > 0);