Skip to content

M
mpd
Commit e0f777d4 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

output/alsa: move code to LockCaughtError()

parent febd1ad0
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
src/output/plugins/AlsaOutputPlugin.cxx
View file @ e0f777d4
...@@ -300,6 +300,12 @@ private: ...@@ -300,6 +300,12 @@ private:
return !!error; return !!error;
} }
void LockCaughtError() noexcept {
const std::lock_guard<Mutex> lock(mutex);
error = std::current_exception();
cond.signal();
}
/* virtual methods from class MultiSocketMonitor */ /* virtual methods from class MultiSocketMonitor */
std::chrono::steady_clock::duration PrepareSockets() noexcept override; std::chrono::steady_clock::duration PrepareSockets() noexcept override;
void DispatchSockets() noexcept override; void DispatchSockets() noexcept override;
...@@ -865,10 +871,7 @@ try { ...@@ -865,10 +871,7 @@ try {
} }
} catch (const std::runtime_error &) { } catch (const std::runtime_error &) {
MultiSocketMonitor::Reset(); MultiSocketMonitor::Reset();
LockCaughtError();
const std::lock_guard<Mutex> lock(mutex);
error = std::current_exception();
cond.signal();
} }
const struct AudioOutputPlugin alsa_output_plugin = { const struct AudioOutputPlugin alsa_output_plugin = {
......
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