diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-29 22:42:52 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-29 22:42:52 +0100 |
| commit | 99e6409a67de5f4af181ac11b2b9fd9b4515e3fa (patch) | |
| tree | 6778503679c780c82fe3afc56a345588ef32e829 /src/output | |
| parent | 6a0a5f9693a69d2b8453d77155d2b238decf964d (diff) | |
| download | mpd-99e6409a67de5f4af181ac11b2b9fd9b4515e3fa.tar.gz mpd-99e6409a67de5f4af181ac11b2b9fd9b4515e3fa.tar.xz mpd-99e6409a67de5f4af181ac11b2b9fd9b4515e3fa.zip | |
{mixer,output}/pulse: move code to LogPulseError()
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/plugins/PulseOutputPlugin.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/output/plugins/PulseOutputPlugin.cxx b/src/output/plugins/PulseOutputPlugin.cxx index 916366bf7..3e50eac52 100644 --- a/src/output/plugins/PulseOutputPlugin.cxx +++ b/src/output/plugins/PulseOutputPlugin.cxx @@ -21,6 +21,7 @@ #include "PulseOutputPlugin.hxx" #include "lib/pulse/Domain.hxx" #include "lib/pulse/Error.hxx" +#include "lib/pulse/LogError.hxx" #include "../OutputAPI.hxx" #include "mixer/MixerList.hxx" #include "mixer/plugins/PulseMixerPlugin.hxx" @@ -618,9 +619,8 @@ pulse_output_close(AudioOutput *ao) o = pa_stream_drain(po->stream, pulse_output_stream_success_cb, po); if (o == nullptr) { - FormatWarning(pulse_domain, - "pa_stream_drain() has failed: %s", - pa_strerror(pa_context_errno(po->context))); + LogPulseError(po->context, + "pa_stream_drain() has failed"); } else pulse_wait_for_operation(po->mainloop, o); } @@ -797,9 +797,7 @@ pulse_output_cancel(AudioOutput *ao) o = pa_stream_flush(po->stream, pulse_output_stream_success_cb, po); if (o == nullptr) { - FormatWarning(pulse_domain, - "pa_stream_flush() has failed: %s", - pa_strerror(pa_context_errno(po->context))); + LogPulseError(po->context, "pa_stream_flush() has failed"); pa_threaded_mainloop_unlock(po->mainloop); return; } |