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

output: rename "chunk" to "current_chunk"

Browse Source
This commit is contained in:
Max Kellermann
2014-01-29 09:23:57 +01:00
parent 4657a3bd0f
commit af71605769
4 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/output/MultipleOutputs.cxx
View File

@@ -264,17 +264,18 @@ chunk_is_consumed_in(const AudioOutput *ao,
if (!ao->open)
return true;
if (ao->chunk == nullptr)
if (ao->current_chunk == nullptr)
return false;
assert(chunk == ao->chunk || pipe->Contains(ao->chunk));
assert(chunk == ao->current_chunk ||
pipe->Contains(ao->current_chunk));
if (chunk != ao->chunk) {
if (chunk != ao->current_chunk) {
assert(chunk->next != nullptr);
return true;
}
return ao->chunk_finished && chunk->next == nullptr;
return ao->current_chunk_finished && chunk->next == nullptr;
}
bool
@@ -309,9 +310,9 @@ MultipleOutputs::ClearTailChunk(gcc_unused const struct music_chunk *chunk,
continue;
}
assert(ao->chunk == chunk);
assert(ao->chunk_finished);
ao->chunk = nullptr;
assert(ao->current_chunk == chunk);
assert(ao->current_chunk_finished);
ao->current_chunk = nullptr;
}
}