diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-04 21:38:46 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-04 21:38:46 +0100 |
| commit | e9b71a0d2846321dcf3f985b9f6332d051374edd (patch) | |
| tree | cc916958e67731f68e496459383a913e28509bda /src/MusicPipe.cxx | |
| parent | efbfe66f21a8865454bc7a9e32305c84c09ba4be (diff) | |
MusicChunk: move functions to methods
Diffstat (limited to 'src/MusicPipe.cxx')
| -rw-r--r-- | src/MusicPipe.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/MusicPipe.cxx b/src/MusicPipe.cxx index 010da97ba..6f25eff82 100644 --- a/src/MusicPipe.cxx +++ b/src/MusicPipe.cxx @@ -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) |