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

{mixer,output}/pulse: move code to LogPulseError()

Browse Source
This commit is contained in:
Max Kellermann
2014-12-29 22:42:52 +01:00
parent 6a0a5f9693
commit 99e6409a67
5 changed files with 71 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mixer/plugins/PulseMixerPlugin.cxx
View File

@@ -20,6 +20,7 @@
#include "config.h"
#include "PulseMixerPlugin.hxx"
#include "lib/pulse/Domain.hxx"
#include "lib/pulse/LogError.hxx"
#include "mixer/MixerInternal.hxx"
#include "mixer/Listener.hxx"
#include "output/plugins/PulseOutputPlugin.hxx"
@@ -30,7 +31,6 @@
#include <pulse/introspect.h>
#include <pulse/stream.h>
#include <pulse/subscribe.h>
#include <pulse/error.h>
#include <assert.h>
@@ -118,9 +118,8 @@ PulseMixer::Update(pa_context *context, pa_stream *stream)
pa_stream_get_index(stream),
pulse_mixer_volume_cb, this);
if (o == nullptr) {
FormatError(pulse_domain,
"pa_context_get_sink_input_info() failed: %s",
pa_strerror(pa_context_errno(context)));
LogPulseError(context,
"pa_context_get_sink_input_info() failed");
Offline();
return;
}
@@ -140,9 +139,8 @@ pulse_mixer_on_connect(gcc_unused PulseMixer &pm,
(pa_subscription_mask_t)PA_SUBSCRIPTION_MASK_SINK_INPUT,
nullptr, nullptr);
if (o == nullptr) {
FormatError(pulse_domain,
"pa_context_subscribe() failed: %s",
pa_strerror(pa_context_errno(context)));
LogPulseError(context,
"pa_context_subscribe() failed");
return;
}