Commit 6e643fe5 authored by Max Kellermann's avatar Max Kellermann

output/Thread: don't deinitialize the pipe in Close()

parent 2bf91a04
......@@ -237,7 +237,7 @@ AudioOutput::Close(bool drain)
{
assert(open);
pipe.Deinit();
pipe.Cancel();
open = false;
......@@ -288,11 +288,8 @@ void
AudioOutput::Reopen()
{
if (!config_audio_format.IsFullyDefined()) {
if (open) {
const MusicPipe &old_pipe = pipe.GetPipe();
if (open)
Close(true);
pipe.Init(old_pipe);
}
/* no audio format is configured: copy in->out, let
the output's open() method determine the effective
......
......@@ -56,11 +56,6 @@ public:
chunk = nullptr;
}
void Deinit() {
pipe = nullptr;
chunk = nullptr;
}
const MusicPipe &GetPipe() {
assert(pipe != nullptr);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment