Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
d6214c84
Commit
d6214c84
authored
Sep 01, 2011
by
Tristan Matthews
Browse files
* #6827: get sink/source list by reference
parent
e8f5c541
Changes
2
Hide whitespace changes
Inline
Side-by-side
daemon/src/audio/pulseaudio/pulselayer.cpp
View file @
d6214c84
...
...
@@ -96,7 +96,7 @@ void sink_input_info_callback (pa_context *c UNUSED, const pa_sink_info *i, int
i
->
flags
&
PA_SINK_LATENCY
?
"LATENCY "
:
""
,
i
->
flags
&
PA_SINK_HARDWARE
?
"HARDWARE"
:
""
);
((
PulseLayer
*
)
userdata
)
->
getSinkList
()
->
push_back
(
i
->
name
);
((
PulseLayer
*
)
userdata
)
->
getSinkList
()
.
push_back
(
i
->
name
);
}
void
source_input_info_callback
(
pa_context
*
c
UNUSED
,
const
pa_source_info
*
i
,
int
eol
,
void
*
userdata
)
...
...
@@ -130,7 +130,7 @@ void source_input_info_callback (pa_context *c UNUSED, const pa_source_info *i,
i
->
flags
&
PA_SOURCE_LATENCY
?
"LATENCY "
:
""
,
i
->
flags
&
PA_SOURCE_HARDWARE
?
"HARDWARE"
:
""
);
((
PulseLayer
*
)
userdata
)
->
getSourceList
()
->
push_back
(
i
->
name
);
((
PulseLayer
*
)
userdata
)
->
getSourceList
()
.
push_back
(
i
->
name
);
}
void
context_changed_callback
(
pa_context
*
c
,
pa_subscription_event_type_t
t
,
uint32_t
idx
UNUSED
,
void
*
userdata
)
...
...
@@ -139,13 +139,13 @@ void context_changed_callback (pa_context* c, pa_subscription_event_type_t t, ui
switch
(
t
)
{
case
PA_SUBSCRIPTION_EVENT_SINK
:
_debug
(
"Audio: PA_SUBSCRIPTION_EVENT_SINK"
);
(
(
PulseLayer
*
)
userdata
)
->
getSinkList
()
->
clear
();
pa_context_get_sink_info_list
(
c
,
sink_input_info_callback
,
userdata
);
(
(
PulseLayer
*
)
userdata
)
->
getSinkList
()
.
clear
();
pa_context_get_sink_info_list
(
c
,
sink_input_info_callback
,
userdata
);
break
;
case
PA_SUBSCRIPTION_EVENT_SOURCE
:
_debug
(
"Audio: PA_SUBSCRIPTION_EVENT_SOURCE"
);
(
(
PulseLayer
*
)
userdata
)
->
getSourceList
()
->
clear
();
pa_context_get_source_info_list
(
c
,
source_input_info_callback
,
userdata
);
(
(
PulseLayer
*
)
userdata
)
->
getSourceList
()
.
clear
();
pa_context_get_source_info_list
(
c
,
source_input_info_callback
,
userdata
);
break
;
case
PA_SUBSCRIPTION_EVENT_SINK_INPUT
:
_debug
(
"Audio: PA_SUBSCRIPTION_EVENT_SINK_INPUT"
);
...
...
@@ -176,10 +176,10 @@ void context_changed_callback (pa_context* c, pa_subscription_event_type_t t, ui
break
;
case
PA_SUBSCRIPTION_EVENT_REMOVE
:
_debug
(
"Audio: PA_SUBSCRIPTION_EVENT_REMOVE"
);
(
(
PulseLayer
*
)
userdata
)
->
getSinkList
()
->
clear
();
(
(
PulseLayer
*
)
userdata
)
->
getSourceList
()
->
clear
();
pa_context_get_sink_info_list
(
c
,
sink_input_info_callback
,
userdata
);
pa_context_get_source_info_list
(
c
,
source_input_info_callback
,
userdata
);
(
(
PulseLayer
*
)
userdata
)
->
getSinkList
()
.
clear
();
(
(
PulseLayer
*
)
userdata
)
->
getSourceList
()
.
clear
();
pa_context_get_sink_info_list
(
c
,
sink_input_info_callback
,
userdata
);
pa_context_get_source_info_list
(
c
,
source_input_info_callback
,
userdata
);
break
;
case
PA_SUBSCRIPTION_EVENT_TYPE_MASK
:
_debug
(
"Audio: PA_SUBSCRIPTION_EVENT_TYPE_MASK"
);
...
...
@@ -287,13 +287,13 @@ void PulseLayer::context_state_callback (pa_context* c, void* user_data)
void
PulseLayer
::
updateSinkList
(
void
)
{
getS
inkList
()
->
clear
();
s
inkList
_
.
clear
();
pa_context_get_sink_info_list
(
context_
,
sink_input_info_callback
,
this
);
}
void
PulseLayer
::
updateSourceList
(
void
)
{
getS
ourceList
()
->
clear
();
s
ourceList
_
.
clear
();
pa_context_get_source_info_list
(
context_
,
source_input_info_callback
,
this
);
}
...
...
daemon/src/audio/pulseaudio/pulselayer.h
View file @
d6214c84
...
...
@@ -47,12 +47,12 @@ class PulseLayer : public AudioLayer
PulseLayer
();
~
PulseLayer
(
void
);
std
::
list
<
std
::
string
>
*
getSinkList
(
void
)
{
return
&
sinkList_
;
std
::
list
<
std
::
string
>
&
getSinkList
(
void
)
{
return
sinkList_
;
}
std
::
list
<
std
::
string
>
*
getSourceList
(
void
)
{
return
&
sourceList_
;
std
::
list
<
std
::
string
>
&
getSourceList
(
void
)
{
return
sourceList_
;
}
/**
...
...
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