Commit 5360c25d authored by Jonathan Marten's avatar Jonathan Marten
Browse files

PulseAudio: Fix copy-and-paste error

Wrong calling function name given to checkOpResult().
parent d136985d
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
#include "core/GlobalConfig.h" #include "core/GlobalConfig.h"
#include <pulse/ext-stream-restore.h> #include <pulse/ext-stream-restore.h>
#if defined(HAVE_CANBERRA) #ifdef HAVE_CANBERRA
# include <canberra.h> #include <canberra.h>
#endif #endif
// PA_VOLUME_UI_MAX landed in pulseaudio-0.9.23, so this can be removed when/if // PA_VOLUME_UI_MAX landed in pulseaudio-0.9.23, so this can be removed when/if
...@@ -60,7 +60,7 @@ static pa_context *s_context = NULL; ...@@ -60,7 +60,7 @@ static pa_context *s_context = NULL;
static enum { UNKNOWN, ACTIVE, INACTIVE } s_pulseActive = UNKNOWN; static enum { UNKNOWN, ACTIVE, INACTIVE } s_pulseActive = UNKNOWN;
static int s_outstandingRequests = 0; static int s_outstandingRequests = 0;
#if defined(HAVE_CANBERRA) #ifdef HAVE_CANBERRA
static ca_context *s_ccontext = NULL; static ca_context *s_ccontext = NULL;
#endif #endif
...@@ -619,7 +619,7 @@ static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t ...@@ -619,7 +619,7 @@ static void subscribe_cb(pa_context *c, pa_subscription_event_type_t t, uint32_t
s_mixers[KMIXPA_APP_CAPTURE]->removeWidget(index); s_mixers[KMIXPA_APP_CAPTURE]->removeWidget(index);
} else { } else {
pa_operation *op = pa_context_get_source_output_info(c, index, source_output_cb, NULL); pa_operation *op = pa_context_get_source_output_info(c, index, source_output_cb, NULL);
checkOpResult(op, "pa_context_get_sink_input_info"); checkOpResult(op, "pa_context_get_source_output_info");
} }
break; break;
...@@ -1036,7 +1036,7 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum ...@@ -1036,7 +1036,7 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum
// Reconnect via integrated mainloop // Reconnect via integrated mainloop
connectToDaemon(); connectToDaemon();
#if defined(HAVE_CANBERRA) #ifdef HAVE_CANBERRA
int ret = ca_context_create(&s_ccontext); int ret = ca_context_create(&s_ccontext);
if (ret < 0) { if (ret < 0) {
qCDebug(KMIX_LOG) << "Disabling sound feedback, Canberra context create failed"; qCDebug(KMIX_LOG) << "Disabling sound feedback, Canberra context create failed";
...@@ -1062,7 +1062,7 @@ Mixer_PULSE::~Mixer_PULSE() ...@@ -1062,7 +1062,7 @@ Mixer_PULSE::~Mixer_PULSE()
--refcount; --refcount;
if (0 == refcount) if (0 == refcount)
{ {
#if defined(HAVE_CANBERRA) #ifdef HAVE_CANBERRA
if (s_ccontext) { if (s_ccontext) {
ca_context_destroy(s_ccontext); ca_context_destroy(s_ccontext);
s_ccontext = NULL; s_ccontext = NULL;
......
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