aboutsummaryrefslogtreecommitdiffstats
path: root/src/MusicPipe.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-08-12 15:56:41 +0200
committerMax Kellermann <max@duempel.org>2014-08-12 15:56:41 +0200
commitc94b4466d52c3c625467312ea565a4685184c517 (patch)
tree940116e9613eacca9746c7f1dfa729048d34f628 /src/MusicPipe.cxx
parent61f9e79ec9921ccf5a5cd53707b8ae161c380bc4 (diff)
downloadmpd-c94b4466d52c3c625467312ea565a4685184c517.tar.gz
mpd-c94b4466d52c3c625467312ea565a4685184c517.tar.xz
mpd-c94b4466d52c3c625467312ea565a4685184c517.zip
MusicChunk: rename struct to MusicChunk
Diffstat (limited to 'src/MusicPipe.cxx')
-rw-r--r--src/MusicPipe.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/MusicPipe.cxx b/src/MusicPipe.cxx
index d7e36f2a4..43ce2dbb2 100644
--- a/src/MusicPipe.cxx
+++ b/src/MusicPipe.cxx
@@ -25,11 +25,11 @@
#ifndef NDEBUG
bool
-MusicPipe::Contains(const music_chunk *chunk) const
+MusicPipe::Contains(const MusicChunk *chunk) const
{
const ScopeLock protect(mutex);
- for (const struct music_chunk *i = head; i != nullptr; i = i->next)
+ for (const MusicChunk *i = head; i != nullptr; i = i->next)
if (i == chunk)
return true;
@@ -38,12 +38,12 @@ MusicPipe::Contains(const music_chunk *chunk) const
#endif
-music_chunk *
+MusicChunk *
MusicPipe::Shift()
{
const ScopeLock protect(mutex);
- music_chunk *chunk = head;
+ MusicChunk *chunk = head;
if (chunk != nullptr) {
assert(!chunk->IsEmpty());
@@ -62,7 +62,7 @@ MusicPipe::Shift()
#ifndef NDEBUG
/* poison the "next" reference */
- chunk->next = (music_chunk *)(void *)0x01010101;
+ chunk->next = (MusicChunk *)(void *)0x01010101;
if (size == 0)
audio_format.Clear();
@@ -75,14 +75,14 @@ MusicPipe::Shift()
void
MusicPipe::Clear(MusicBuffer &buffer)
{
- music_chunk *chunk;
+ MusicChunk *chunk;
while ((chunk = Shift()) != nullptr)
buffer.Return(chunk);
}
void
-MusicPipe::Push(music_chunk *chunk)
+MusicPipe::Push(MusicChunk *chunk)
{
assert(!chunk->IsEmpty());
assert(chunk->length == 0 || chunk->audio_format.IsValid());