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

rework logic how alsa sinks/sources/cards are named

Browse source
This commit is contained in:
Lennart Poettering 2009-01-22 00:24:13 +01:00
parent 7c11554daa
commit b606c0940a
5 changed files with 92 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1209,6 +1209,32 @@ finish:
pa_log_debug("Thread shutting down");
}
static void set_sink_name(pa_sink_new_data *data, pa_modargs *ma, const char *device_id, const char *device_name) {
const char *n;
char *t;
pa_assert(data);
pa_assert(ma);
pa_assert(device_name);
if ((n = pa_modargs_get_value(ma, "sink_name", NULL))) {
pa_sink_new_data_set_name(data, n);
data->namereg_fail = TRUE;
return;
}
if ((n = pa_modargs_get_value(ma, "name", NULL)))
data->namereg_fail = TRUE;
else {
n = device_id ? device_id : device_name;
data->namereg_fail = FALSE;
}
t = pa_sprintf_malloc("alsa_output.%s", n);
pa_sink_new_data_set_name(data, t);
pa_xfree(t);
}
pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL;
@ -1220,9 +1246,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
size_t frame_size;
snd_pcm_info_t *pcm_info = NULL;
int err;
const char *name;
char *name_buf = NULL;
pa_bool_t namereg_fail;
pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d;
pa_usec_t usec;
pa_sink_new_data data;
@ -1404,22 +1427,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
}
}
if ((name = pa_modargs_get_value(ma, "sink_name", NULL)))
namereg_fail = TRUE;
else if ((name = pa_modargs_get_value(ma, "name", NULL))) {
name = name_buf = pa_sprintf_malloc("alsa_output.%s", name);
namereg_fail = TRUE;
} else {
name = name_buf = pa_sprintf_malloc("alsa_output.%s", u->device_name);
namereg_fail = FALSE;
}
pa_sink_new_data_init(&data);
data.driver = driver;
data.module = m;
data.card = card;
pa_sink_new_data_set_name(&data, name);
data.namereg_fail = namereg_fail;
set_sink_name(&data, ma, dev_id, u->device_name);
pa_sink_new_data_set_sample_spec(&data, &ss);
pa_sink_new_data_set_channel_map(&data, &map);
@ -1436,7 +1448,6 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const char*driver, pa_ca
u->sink = pa_sink_new(m->core, &data, PA_SINK_HARDWARE|PA_SINK_LATENCY);
pa_sink_new_data_done(&data);
pa_xfree(name_buf);
if (!u->sink) {
pa_log("Failed to create sink object");