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

MusicPipe: eliminate the unused MusicBuffer reference

Browse Source 
This requires re-adding the reference to struct DecoderControl, which
was removed recently by commit
9f14e7a98d
This commit is contained in:
Max Kellermann
2018-06-23 18:04:09 +02:00
parent 076be809c2
commit 2be905b2e2
8 changed files with 17 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/player/Thread.cxx
View File

@@ -343,7 +343,7 @@ Player::StartDecoder(MusicPipe &_pipe) noexcept
dc.Start(std::make_unique<DetachedSong>(*pc.next_song),
start_time, pc.next_song->GetEndTime(),
_pipe);
buffer, _pipe);
}
void
@@ -445,7 +445,7 @@ Player::OpenOutput() noexcept
try {
const ScopeUnlock unlock(pc.mutex);
pc.outputs.Open(play_audio_format, buffer);
pc.outputs.Open(play_audio_format);
} catch (...) {
LogError(std::current_exception());
@@ -661,7 +661,7 @@ Player::ProcessCommand() noexcept
pc.CommandFinished();
if (dc.IsIdle())
StartDecoder(*new MusicPipe(buffer));
StartDecoder(*new MusicPipe());
break;
@@ -932,7 +932,7 @@ Player::SongBorder() noexcept
inline void
Player::Run() noexcept
{
pipe = new MusicPipe(buffer);
pipe = new MusicPipe();
const std::lock_guard<Mutex> lock(pc.mutex);
@@ -979,7 +979,7 @@ Player::Run() noexcept
assert(dc.pipe == nullptr || dc.pipe == pipe);
StartDecoder(*new MusicPipe(buffer));
StartDecoder(*new MusicPipe());
}
if (/* no cross-fading if MPD is going to pause at the