[pulseaudio-commits] src/modules
Tanu Kaskinen
tanuk at kemper.freedesktop.org
Fri Jan 6 02:10:38 PST 2012
src/modules/alsa/alsa-mixer.c | 226 +++++++++++++++++++-----------------------
1 file changed, 105 insertions(+), 121 deletions(-)
New commits:
commit 45262959e21a6c36eea5aae43b988d82347cf487
Author: David Henningsson <david.henningsson at canonical.com>
Date: Fri Dec 2 18:14:18 2011 +0100
alsa-mixer: Refactor pa_alsa_profile_set_probe().
Increase readability of the pa_alsa_profile_set_probe function of
alsa-mixer.c
Signed-off-by: David Henningsson <david.henningsson at canonical.com>
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
index 36f3351..2802231 100644
--- a/src/modules/alsa/alsa-mixer.c
+++ b/src/modules/alsa/alsa-mixer.c
@@ -4151,6 +4151,76 @@ fail:
return NULL;
}
+static void profile_finalize_probing(pa_alsa_profile *to_be_finalized, pa_alsa_profile *next) {
+ pa_alsa_mapping *m;
+ uint32_t idx;
+
+ if (!to_be_finalized)
+ return;
+
+ if (to_be_finalized->output_mappings)
+ PA_IDXSET_FOREACH(m, to_be_finalized->output_mappings, idx) {
+
+ if (!m->output_pcm)
+ continue;
+
+ if (to_be_finalized->supported)
+ m->supported++;
+
+ /* If this mapping is also in the next profile, we won't close the
+ * pcm handle here, because it would get immediately reopened
+ * anyway. */
+ if (next && next->output_mappings && pa_idxset_get_by_data(next->output_mappings, m, NULL))
+ continue;
+
+ snd_pcm_close(m->output_pcm);
+ m->output_pcm = NULL;
+ }
+
+ if (to_be_finalized->input_mappings)
+ PA_IDXSET_FOREACH(m, to_be_finalized->input_mappings, idx) {
+
+ if (!m->input_pcm)
+ continue;
+
+ if (to_be_finalized->supported)
+ m->supported++;
+
+ /* If this mapping is also in the next profile, we won't close the
+ * pcm handle here, because it would get immediately reopened
+ * anyway. */
+ if (next && next->input_mappings && pa_idxset_get_by_data(next->input_mappings, m, NULL))
+ continue;
+
+ snd_pcm_close(m->input_pcm);
+ m->input_pcm = NULL;
+ }
+}
+
+static snd_pcm_t* mapping_open_pcm(pa_alsa_mapping *m,
+ const pa_sample_spec *ss,
+ const char *dev_id,
+ int mode,
+ unsigned default_n_fragments,
+ unsigned default_fragment_size_msec) {
+
+ pa_sample_spec try_ss = *ss;
+ pa_channel_map try_map = m->channel_map;
+ snd_pcm_uframes_t try_period_size, try_buffer_size;
+
+ try_ss.channels = try_map.channels;
+
+ try_period_size =
+ pa_usec_to_bytes(default_fragment_size_msec * PA_USEC_PER_MSEC, &try_ss) /
+ pa_frame_size(&try_ss);
+ try_buffer_size = default_n_fragments * try_period_size;
+
+ return pa_alsa_open_by_template(
+ m->device_strings, dev_id, NULL, &try_ss,
+ &try_map, mode, &try_period_size,
+ &try_buffer_size, 0, NULL, NULL, TRUE);
+}
+
void pa_alsa_profile_set_probe(
pa_alsa_profile_set *ps,
const char *dev_id,
@@ -4170,115 +4240,54 @@ void pa_alsa_profile_set_probe(
return;
PA_HASHMAP_FOREACH(p, ps->profiles, state) {
- pa_sample_spec try_ss;
- pa_channel_map try_map;
- snd_pcm_uframes_t try_period_size, try_buffer_size;
uint32_t idx;
- /* Is this already marked that it is supported? (i.e. from the config file) */
- if (p->supported)
- goto probe_paths;
-
- pa_log_debug("Looking at profile %s", p->name);
-
- /* Close PCMs from the last iteration we don't need anymore */
- if (last && last->output_mappings)
- PA_IDXSET_FOREACH(m, last->output_mappings, idx) {
-
- if (!m->output_pcm)
- break;
-
- if (last->supported)
- m->supported++;
-
- if (!p->output_mappings || !pa_idxset_get_by_data(p->output_mappings, m, NULL)) {
- snd_pcm_close(m->output_pcm);
- m->output_pcm = NULL;
- }
- }
-
- if (last && last->input_mappings)
- PA_IDXSET_FOREACH(m, last->input_mappings, idx) {
-
- if (!m->input_pcm)
- break;
-
- if (last->supported)
- m->supported++;
-
- if (!p->input_mappings || !pa_idxset_get_by_data(p->input_mappings, m, NULL)) {
- snd_pcm_close(m->input_pcm);
- m->input_pcm = NULL;
- }
- }
+ /* Skip if this is already marked that it is supported (i.e. from the config file) */
+ if (!p->supported) {
- p->supported = TRUE;
+ pa_log_debug("Looking at profile %s", p->name);
+ profile_finalize_probing(last, p);
+ p->supported = TRUE;
- /* Check if we can open all new ones */
- if (p->output_mappings)
- PA_IDXSET_FOREACH(m, p->output_mappings, idx) {
+ /* Check if we can open all new ones */
+ if (p->output_mappings)
+ PA_IDXSET_FOREACH(m, p->output_mappings, idx) {
- if (m->output_pcm)
- continue;
+ if (m->output_pcm)
+ continue;
- pa_log_debug("Checking for playback on %s (%s)", m->description, m->name);
- try_map = m->channel_map;
- try_ss = *ss;
- try_ss.channels = try_map.channels;
-
- try_period_size =
- pa_usec_to_bytes(default_fragment_size_msec * PA_USEC_PER_MSEC, &try_ss) /
- pa_frame_size(&try_ss);
- try_buffer_size = default_n_fragments * try_period_size;
-
- if (!(m ->output_pcm = pa_alsa_open_by_template(
- m->device_strings,
- dev_id,
- NULL,
- &try_ss, &try_map,
- SND_PCM_STREAM_PLAYBACK,
- &try_period_size, &try_buffer_size, 0, NULL, NULL,
- TRUE))) {
- p->supported = FALSE;
- break;
+ pa_log_debug("Checking for playback on %s (%s)", m->description, m->name);
+ if (!(m->output_pcm = mapping_open_pcm(m, ss, dev_id,
+ SND_PCM_STREAM_PLAYBACK,
+ default_n_fragments,
+ default_fragment_size_msec))) {
+ p->supported = FALSE;
+ break;
+ }
}
- }
- if (p->input_mappings && p->supported)
- PA_IDXSET_FOREACH(m, p->input_mappings, idx) {
+ if (p->input_mappings && p->supported)
+ PA_IDXSET_FOREACH(m, p->input_mappings, idx) {
- if (m->input_pcm)
- continue;
+ if (m->input_pcm)
+ continue;
- pa_log_debug("Checking for recording on %s (%s)", m->description, m->name);
- try_map = m->channel_map;
- try_ss = *ss;
- try_ss.channels = try_map.channels;
-
- try_period_size =
- pa_usec_to_bytes(default_fragment_size_msec*PA_USEC_PER_MSEC, &try_ss) /
- pa_frame_size(&try_ss);
- try_buffer_size = default_n_fragments * try_period_size;
-
- if (!(m ->input_pcm = pa_alsa_open_by_template(
- m->device_strings,
- dev_id,
- NULL,
- &try_ss, &try_map,
- SND_PCM_STREAM_CAPTURE,
- &try_period_size, &try_buffer_size, 0, NULL, NULL,
- TRUE))) {
- p->supported = FALSE;
- break;
+ pa_log_debug("Checking for recording on %s (%s)", m->description, m->name);
+ if (!(m->input_pcm = mapping_open_pcm(m, ss, dev_id,
+ SND_PCM_STREAM_CAPTURE,
+ default_n_fragments,
+ default_fragment_size_msec))) {
+ p->supported = FALSE;
+ break;
+ }
}
- }
- last = p;
+ last = p;
- if (!p->supported)
- continue;
+ if (!p->supported)
+ continue;
+ }
-probe_paths:
pa_log_debug("Profile %s supported.", p->name);
if (p->output_mappings)
@@ -4290,35 +4299,10 @@ probe_paths:
PA_IDXSET_FOREACH(m, p->input_mappings, idx)
if (m->input_pcm)
mapping_paths_probe(m, p, PA_ALSA_DIRECTION_INPUT);
-
}
/* Clean up */
- if (last) {
- uint32_t idx;
-
- if (last->output_mappings)
- PA_IDXSET_FOREACH(m, last->output_mappings, idx)
- if (m->output_pcm) {
-
- if (last->supported)
- m->supported++;
-
- snd_pcm_close(m->output_pcm);
- m->output_pcm = NULL;
- }
-
- if (last->input_mappings)
- PA_IDXSET_FOREACH(m, last->input_mappings, idx)
- if (m->input_pcm) {
-
- if (last->supported)
- m->supported++;
-
- snd_pcm_close(m->input_pcm);
- m->input_pcm = NULL;
- }
- }
+ profile_finalize_probing(last, NULL);
PA_HASHMAP_FOREACH(p, ps->profiles, state)
if (!p->supported) {
More information about the pulseaudio-commits
mailing list