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

MusicChunk: move functions to methods

Browse Source
This commit is contained in:
Max Kellermann
2013-01-04 21:38:46 +01:00
parent efbfe66f21
commit e9b71a0d28
8 changed files with 90 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MusicPipe.cxx
View File

@@ -111,7 +111,7 @@ music_pipe_shift(struct music_pipe *mp)
struct music_chunk *chunk = mp->head;
if (chunk != NULL) {
assert(!music_chunk_is_empty(chunk));
assert(!chunk->IsEmpty());
mp->head = chunk->next;
--mp->size;
@@ -150,14 +150,14 @@ music_pipe_clear(struct music_pipe *mp, struct music_buffer *buffer)
void
music_pipe_push(struct music_pipe *mp, struct music_chunk *chunk)
{
assert(!music_chunk_is_empty(chunk));
assert(!chunk->IsEmpty());
assert(chunk->length == 0 || audio_format_valid(&chunk->audio_format));
const ScopeLock protect(mp->mutex);
assert(mp->size > 0 || !audio_format_defined(&mp->audio_format));
assert(!audio_format_defined(&mp->audio_format) ||
music_chunk_check_format(chunk, &mp->audio_format));
chunk->CheckFormat(mp->audio_format));
#ifndef NDEBUG
if (!audio_format_defined(&mp->audio_format) && chunk->length > 0)