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

MusicChunkPtr: managed MusicChunk pointer

Browse Source 
Make all uses of MusicChunk safe.
This commit is contained in:
Max Kellermann
2017-12-30 18:00:40 +01:00
parent e81b089612
commit 54d295c247
14 changed files with 120 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/output/MultipleOutputs.cxx
View File

@@ -205,7 +205,7 @@ MultipleOutputs::SetReplayGainMode(ReplayGainMode mode) noexcept
}
void
MultipleOutputs::Play(MusicChunk *chunk)
MultipleOutputs::Play(MusicChunkPtr chunk)
{
assert(pipe != nullptr);
assert(chunk != nullptr);
@@ -215,7 +215,7 @@ MultipleOutputs::Play(MusicChunk *chunk)
/* TODO: obtain real error */
throw std::runtime_error("Failed to open audio output");
pipe->Push(chunk);
pipe->Push(std::move(chunk));
for (auto *ao : outputs)
ao->LockPlay();
@@ -314,7 +314,6 @@ MultipleOutputs::CheckPipe() noexcept
{
const MusicChunk *chunk;
bool is_tail;
MusicChunk *shifted;
bool locked[outputs.size()];
assert(pipe != nullptr);
@@ -339,8 +338,8 @@ MultipleOutputs::CheckPipe() noexcept
ClearTailChunk(chunk, locked);
/* remove the chunk from the pipe */
shifted = pipe->Shift();
assert(shifted == chunk);
const auto shifted = pipe->Shift();
assert(shifted.get() == chunk);
if (is_tail)
/* unlock all audio outputs which were locked
@@ -349,8 +348,8 @@ MultipleOutputs::CheckPipe() noexcept
if (locked[i])
outputs[i]->mutex.unlock();
/* return the chunk to the buffer */
pipe->GetBuffer().Return(shifted);
/* chunk is automatically returned to the buffer by
~MusicChunkPtr() */
}
return 0;

4
src/output/MultipleOutputs.hxx
View File

@@ -27,6 +27,7 @@
#define OUTPUT_ALL_H
#include "Control.hxx"
#include "MusicChunkPtr.hxx"
#include "player/Outputs.hxx"
#include "AudioFormat.hxx"
#include "ReplayGainMode.hxx"
@@ -42,7 +43,6 @@ class MusicPipe;
class EventLoop;
class MixerListener;
class AudioOutputClient;
struct MusicChunk;
struct ReplayGainConfig;
class MultipleOutputs final : public PlayerOutputs {
@@ -185,7 +185,7 @@ private:
MusicBuffer &_buffer) override;
void Close() noexcept override;
void Release() noexcept override;
void Play(MusicChunk *chunk) override;
void Play(MusicChunkPtr chunk) override;
unsigned CheckPipe() noexcept override;
void Pause() noexcept override;
void Drain() noexcept override;