Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Multimedia
KMix
Commits
5360c25d
Commit
5360c25d
authored
Oct 06, 2020
by
Jonathan Marten
Browse files
PulseAudio: Fix copy-and-paste error
Wrong calling function name given to checkOpResult().
parent
d136985d
Changes
1
Hide whitespace changes
Inline
Side-by-side
backends/mixer_pulse.cpp
View file @
5360c25d
...
...
@@ -35,8 +35,8 @@
#include "core/GlobalConfig.h"
#include <pulse/ext-stream-restore.h>
#if
def
ined(
HAVE_CANBERRA
)
#
include <canberra.h>
#ifdef
HAVE_CANBERRA
#include <canberra.h>
#endif
// 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;
static
enum
{
UNKNOWN
,
ACTIVE
,
INACTIVE
}
s_pulseActive
=
UNKNOWN
;
static
int
s_outstandingRequests
=
0
;
#if
def
ined(
HAVE_CANBERRA
)
#ifdef
HAVE_CANBERRA
static
ca_context
*
s_ccontext
=
NULL
;
#endif
...
...
@@ -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
);
}
else
{
pa_operation
*
op
=
pa_context_get_source_output_info
(
c
,
index
,
source_output_cb
,
NULL
);
checkOpResult
(
op
,
"pa_context_get_s
ink_in
put_info"
);
checkOpResult
(
op
,
"pa_context_get_s
ource_out
put_info"
);
}
break
;
...
...
@@ -1036,7 +1036,7 @@ Mixer_PULSE::Mixer_PULSE(Mixer *mixer, int devnum) : Mixer_Backend(mixer, devnum
// Reconnect via integrated mainloop
connectToDaemon
();
#if
def
ined(
HAVE_CANBERRA
)
#ifdef
HAVE_CANBERRA
int
ret
=
ca_context_create
(
&
s_ccontext
);
if
(
ret
<
0
)
{
qCDebug
(
KMIX_LOG
)
<<
"Disabling sound feedback, Canberra context create failed"
;
...
...
@@ -1062,7 +1062,7 @@ Mixer_PULSE::~Mixer_PULSE()
--
refcount
;
if
(
0
==
refcount
)
{
#if
def
ined(
HAVE_CANBERRA
)
#ifdef
HAVE_CANBERRA
if
(
s_ccontext
)
{
ca_context_destroy
(
s_ccontext
);
s_ccontext
=
NULL
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment