Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 10:35:10 +00:00
Code Issues Releases Activity

Possibly Fixes #319 (#333)

Browse Source 
*tunneled* pulseaudio sinks do not have any card associated to them.
This commit is contained in:
Stephane Fontaine 2016-10-18 22:41:04 +04:00 committed by Brenden Matthews
parent 271ca6dc97
commit ddf8a0f58f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pulseaudio.cc
View File

@ -217,12 +217,14 @@ void init_pulseaudio(struct text_object *obj) {
PULSEAUDIO_WAIT(pa_context_get_sink_info_by_name(pulseaudio->context, pulseaudio->result.sink_name.c_str(), PULSEAUDIO_WAIT(pa_context_get_sink_info_by_name(pulseaudio->context, pulseaudio->result.sink_name.c_str(),
pa_sink_info_callback, &pulseaudio->result)); pa_sink_info_callback, &pulseaudio->result));
if (pulseaudio->result.sink_name.empty() || pulseaudio->result.sink_card==(uint32_t)-1){ if (pulseaudio->result.sink_name.empty()){
NORM_ERR("Incorrect pulseaudio sink information."); NORM_ERR("Incorrect pulseaudio sink information.");
return; return;
} }
PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
pa_card_info_callback, &pulseaudio->result)); if(pulseaudio->result.sink_card!=(uint32_t)-1)
PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
pa_card_info_callback, &pulseaudio->result));
// get notification when something changes in PA // get notification when something changes in PA
pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result); pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);