From c94b4466d52c3c625467312ea565a4685184c517 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 12 Aug 2014 15:56:41 +0200 Subject: MusicChunk: rename struct to MusicChunk --- src/output/Internal.hxx | 10 +++++----- src/output/MultipleOutputs.cxx | 12 ++++++------ src/output/MultipleOutputs.hxx | 16 ++++++++-------- src/output/OutputThread.cxx | 10 +++++----- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/output') diff --git a/src/output/Internal.hxx b/src/output/Internal.hxx index 266930448..658ebd4e1 100644 --- a/src/output/Internal.hxx +++ b/src/output/Internal.hxx @@ -35,7 +35,7 @@ class MusicPipe; class EventLoop; class Mixer; class MixerListener; -struct music_chunk; +struct MusicChunk; struct config_param; struct PlayerControl; struct AudioOutputPlugin; @@ -257,12 +257,12 @@ struct AudioOutput { PlayerControl *player_control; /** - * The #music_chunk which is currently being played. All + * The #MusicChunk which is currently being played. All * chunks before this one may be returned to the * #music_buffer, because they are not going to be used by * this output anymore. */ - const music_chunk *current_chunk; + const MusicChunk *current_chunk; /** * Has the output finished playing #current_chunk? @@ -395,9 +395,9 @@ private: bool WaitForDelay(); gcc_pure - const music_chunk *GetNextChunk() const; + const MusicChunk *GetNextChunk() const; - bool PlayChunk(const music_chunk *chunk); + bool PlayChunk(const MusicChunk *chunk); /** * Plays all remaining chunks, until the tail of the pipe has diff --git a/src/output/MultipleOutputs.cxx b/src/output/MultipleOutputs.cxx index 6cd2c9fa6..fe51c6100 100644 --- a/src/output/MultipleOutputs.cxx +++ b/src/output/MultipleOutputs.cxx @@ -187,7 +187,7 @@ MultipleOutputs::SetReplayGainMode(ReplayGainMode mode) } bool -MultipleOutputs::Play(music_chunk *chunk, Error &error) +MultipleOutputs::Play(MusicChunk *chunk, Error &error) { assert(buffer != nullptr); assert(pipe != nullptr); @@ -265,7 +265,7 @@ gcc_pure static bool chunk_is_consumed_in(const AudioOutput *ao, gcc_unused const MusicPipe *pipe, - const struct music_chunk *chunk) + const MusicChunk *chunk) { if (!ao->open) return true; @@ -285,7 +285,7 @@ chunk_is_consumed_in(const AudioOutput *ao, } bool -MultipleOutputs::IsChunkConsumed(const music_chunk *chunk) const +MultipleOutputs::IsChunkConsumed(const MusicChunk *chunk) const { for (auto ao : outputs) { const ScopeLock protect(ao->mutex); @@ -297,7 +297,7 @@ MultipleOutputs::IsChunkConsumed(const music_chunk *chunk) const } inline void -MultipleOutputs::ClearTailChunk(gcc_unused const struct music_chunk *chunk, +MultipleOutputs::ClearTailChunk(gcc_unused const MusicChunk *chunk, bool *locked) { assert(chunk->next == nullptr); @@ -325,9 +325,9 @@ MultipleOutputs::ClearTailChunk(gcc_unused const struct music_chunk *chunk, unsigned MultipleOutputs::Check() { - const struct music_chunk *chunk; + const MusicChunk *chunk; bool is_tail; - struct music_chunk *shifted; + MusicChunk *shifted; bool locked[outputs.size()]; assert(buffer != nullptr); diff --git a/src/output/MultipleOutputs.hxx b/src/output/MultipleOutputs.hxx index 296b9815e..f8482037c 100644 --- a/src/output/MultipleOutputs.hxx +++ b/src/output/MultipleOutputs.hxx @@ -39,7 +39,7 @@ class MusicBuffer; class MusicPipe; class EventLoop; class MixerListener; -struct music_chunk; +struct MusicChunk; struct PlayerControl; struct AudioOutput; class Error; @@ -119,7 +119,7 @@ public: * Opens all audio outputs which are not disabled. * * @param audio_format the preferred audio format - * @param buffer the #music_buffer where consumed #music_chunk objects + * @param buffer the #music_buffer where consumed #MusicChunk objects * should be returned * @return true on success, false on failure */ @@ -140,14 +140,14 @@ public: void SetReplayGainMode(ReplayGainMode mode); /** - * Enqueue a #music_chunk object for playing, i.e. pushes it to a + * Enqueue a #MusicChunk object for playing, i.e. pushes it to a * #MusicPipe. * - * @param chunk the #music_chunk object to be played + * @param chunk the #MusicChunk object to be played * @return true on success, false if no audio output was able to play * (all closed then) */ - bool Play(music_chunk *chunk, Error &error); + bool Play(MusicChunk *chunk, Error &error); /** * Checks if the output devices have drained their music pipe, and @@ -160,7 +160,7 @@ public: /** * Checks if the size of the #MusicPipe is below the #threshold. If * not, it attempts to synchronize with all output threads, and waits - * until another #music_chunk is finished. + * until another #MusicChunk is finished. * * @param threshold the maximum number of chunks in the pipe * @return true if there are less than #threshold chunks in the pipe @@ -262,14 +262,14 @@ private: /** * Has this chunk been consumed by all audio outputs? */ - bool IsChunkConsumed(const music_chunk *chunk) const; + bool IsChunkConsumed(const MusicChunk *chunk) const; /** * There's only one chunk left in the pipe (#pipe), and all * audio outputs have consumed it already. Clear the * reference. */ - void ClearTailChunk(const struct music_chunk *chunk, bool *locked); + void ClearTailChunk(const MusicChunk *chunk, bool *locked); }; #endif diff --git a/src/output/OutputThread.cxx b/src/output/OutputThread.cxx index a7fb2b87f..1986d2e1b 100644 --- a/src/output/OutputThread.cxx +++ b/src/output/OutputThread.cxx @@ -307,7 +307,7 @@ AudioOutput::WaitForDelay() } static const void * -ao_chunk_data(AudioOutput *ao, const struct music_chunk *chunk, +ao_chunk_data(AudioOutput *ao, const MusicChunk *chunk, Filter *replay_gain_filter, unsigned *replay_gain_serial_p, size_t *length_r) @@ -347,7 +347,7 @@ ao_chunk_data(AudioOutput *ao, const struct music_chunk *chunk, } static const void * -ao_filter_chunk(AudioOutput *ao, const struct music_chunk *chunk, +ao_filter_chunk(AudioOutput *ao, const MusicChunk *chunk, size_t *length_r) { size_t length; @@ -417,7 +417,7 @@ ao_filter_chunk(AudioOutput *ao, const struct music_chunk *chunk, } inline bool -AudioOutput::PlayChunk(const music_chunk *chunk) +AudioOutput::PlayChunk(const MusicChunk *chunk) { assert(filter != nullptr); @@ -478,7 +478,7 @@ AudioOutput::PlayChunk(const music_chunk *chunk) return true; } -inline const music_chunk * +inline const MusicChunk * AudioOutput::GetNextChunk() const { return current_chunk != nullptr @@ -493,7 +493,7 @@ AudioOutput::Play() { assert(pipe != nullptr); - const music_chunk *chunk = GetNextChunk(); + const MusicChunk *chunk = GetNextChunk(); if (chunk == nullptr) /* no chunk available */ return false; -- cgit v1.2.3