"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/modules/alsa/module-alsa-card.c" between
pulseaudio-14.0.tar.xz and pulseaudio-14.2.tar.xz

About: PulseAudio is a networked sound server (for POSIX OSes), a proxy for your sound applications.

module-alsa-card.c  (pulseaudio-14.0.tar.xz):module-alsa-card.c  (pulseaudio-14.2.tar.xz)
skipping to change at line 624 skipping to change at line 624
} }
else else
pa_log_debug("No ELD device found for port %s (%d).", port->name, de vice); pa_log_debug("No ELD device found for port %s (%d).", port->name, de vice);
} }
} }
static void init_jacks(struct userdata *u) { static void init_jacks(struct userdata *u) {
void *state; void *state;
pa_alsa_path* path; pa_alsa_path* path;
pa_alsa_jack* jack; pa_alsa_jack* jack;
char buf[64];
u->jacks = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_com pare_func); u->jacks = pa_hashmap_new(pa_idxset_trivial_hash_func, pa_idxset_trivial_com pare_func);
if (u->use_ucm) { if (u->use_ucm) {
PA_LLIST_FOREACH(jack, u->ucm.jacks) PA_LLIST_FOREACH(jack, u->ucm.jacks)
if (jack->has_control) if (jack->has_control)
pa_hashmap_put(u->jacks, jack, jack); pa_hashmap_put(u->jacks, jack, jack);
} else { } else {
/* See if we have any jacks */ /* See if we have any jacks */
if (u->profile_set->output_paths) if (u->profile_set->output_paths)
skipping to change at line 666 skipping to change at line 667
continue; continue;
} }
} else { } else {
jack->mixer_handle = pa_alsa_open_mixer_by_name(u->mixers, jack->mix er_device_name, false); jack->mixer_handle = pa_alsa_open_mixer_by_name(u->mixers, jack->mix er_device_name, false);
if (!jack->mixer_handle) { if (!jack->mixer_handle) {
pa_log("Failed to open mixer '%s' for jack detection", jack->mixe r_device_name); pa_log("Failed to open mixer '%s' for jack detection", jack->mixe r_device_name);
continue; continue;
} }
} }
pa_alsa_mixer_set_fdlist(u->mixers, jack->mixer_handle, u->core->mainloo p); pa_alsa_mixer_set_fdlist(u->mixers, jack->mixer_handle, u->core->mainloo p);
jack->melem = pa_alsa_mixer_find_card(jack->mixer_handle, jack->alsa_nam e, 0); jack->melem = pa_alsa_mixer_find_card(jack->mixer_handle, &jack->alsa_id , 0);
if (!jack->melem) { if (!jack->melem) {
pa_log_warn("Jack '%s' seems to have disappeared.", jack->alsa_name) pa_alsa_mixer_id_to_string(buf, sizeof(buf), &jack->alsa_id);
; pa_log_warn("Jack %s seems to have disappeared.", buf);
pa_alsa_jack_set_has_control(jack, false); pa_alsa_jack_set_has_control(jack, false);
continue; continue;
} }
snd_mixer_elem_set_callback(jack->melem, report_jack_state); snd_mixer_elem_set_callback(jack->melem, report_jack_state);
snd_mixer_elem_set_callback_private(jack->melem, u); snd_mixer_elem_set_callback_private(jack->melem, u);
report_jack_state(jack->melem, 0); report_jack_state(jack->melem, 0);
} }
} }
static void prune_singleton_availability_groups(pa_hashmap *ports) { static void prune_singleton_availability_groups(pa_hashmap *ports) {
 End of changes. 3 change blocks. 
3 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)