mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink, source: Always create a hashmap for ports.

Browse source 
Having the hashmap sometimes NULL requires a lot of checking
here and there, so ensuring that the hashmap is always
non-NULL simplifies the code.
This commit is contained in:
Tanu Kaskinen 2012-06-08 21:49:09 +03:00
parent 21c6c70438
commit 1a6da64b16
10 changed files with 56 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/modules/alsa/alsa-mixer.c
View file

@ -4462,17 +4462,21 @@ void pa_alsa_path_set_add_ports(
}
}
void pa_alsa_add_ports(pa_hashmap **p, pa_alsa_path_set *ps, pa_card *card) {
void pa_alsa_add_ports(void *sink_or_source_new_data, pa_alsa_path_set *ps, pa_card *card) {
pa_hashmap *ports;
pa_assert(p);
pa_assert(!*p);
pa_assert(sink_or_source_new_data);
pa_assert(ps);
if (ps->direction == PA_ALSA_DIRECTION_OUTPUT)
ports = ((pa_sink_new_data *) sink_or_source_new_data)->ports;
else
ports = ((pa_source_new_data *) sink_or_source_new_data)->ports;
if (ps->paths && pa_hashmap_size(ps->paths) > 0) {
pa_assert(card);
*p = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
pa_alsa_path_set_add_ports(ps, NULL, card->ports, *p, card->core);
pa_alsa_path_set_add_ports(ps, NULL, card->ports, ports, card->core);
}
pa_log_debug("Added %u ports", *p ? pa_hashmap_size(*p) : 0);
pa_log_debug("Added %u ports", pa_hashmap_size(ports));
}

2
src/modules/alsa/alsa-mixer.h
View file

@ -340,7 +340,7 @@ struct pa_alsa_port_data {
pa_alsa_setting *setting;
};
void pa_alsa_add_ports(pa_hashmap **p, pa_alsa_path_set *ps, pa_card *card);
void pa_alsa_add_ports(void *sink_or_source_new_data, pa_alsa_path_set *ps, pa_card *card);
void pa_alsa_path_set_add_ports(pa_alsa_path_set *ps, pa_card_profile *cp, pa_hashmap *ports, pa_hashmap *extra, pa_core *core);
#endif

2
src/modules/alsa/alsa-sink.c
View file

@ -2226,7 +2226,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
}
if (u->mixer_path_set)
pa_alsa_add_ports(&data.ports, u->mixer_path_set, card);
pa_alsa_add_ports(&data, u->mixer_path_set, card);
u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE | PA_SINK_LATENCY | (u->use_tsched ? PA_SINK_DYNAMIC_LATENCY : 0) |
(set_formats ? PA_SINK_SET_FORMATS : 0));

2
src/modules/alsa/alsa-source.c
View file

@ -1952,7 +1952,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p
}
if (u->mixer_path_set)
pa_alsa_add_ports(&data.ports, u->mixer_path_set, card);
pa_alsa_add_ports(&data, u->mixer_path_set, card);
u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY|(u->use_tsched ? PA_SOURCE_DYNAMIC_LATENCY : 0));
pa_source_new_data_done(&data);