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

fill in dev_id properly

Browse source
This commit is contained in:
Lennart Poettering 2009-01-21 02:01:44 +01:00
parent 28f05e0435
commit 7ca0e00a2c
2 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1204,7 +1204,7 @@ finish:
pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) { pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL; struct userdata *u = NULL;
const char *dev_id; const char *dev_id = NULL;
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark; uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
@ -1222,6 +1222,7 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
snd_pcm_info_alloca(&pcm_info); snd_pcm_info_alloca(&pcm_info);
pa_assert(m); pa_assert(m);
pa_assert(ma);
ss = m->core->default_sample_spec; ss = m->core->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) { if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map, PA_CHANNEL_MAP_ALSA) < 0) {
@ -1287,6 +1288,11 @@ pa_sink *pa_alsa_sink_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_in
if (profile) { if (profile) {
if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
pa_log("device_id= not set");
goto fail;
}
if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile( if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
dev_id, dev_id,
&u->device_name, &u->device_name,

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

@ -1039,7 +1039,7 @@ finish:
pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) { pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profile_info *profile) {
struct userdata *u = NULL; struct userdata *u = NULL;
const char *dev_id; const char *dev_id = NULL;
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map map; pa_channel_map map;
uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark; uint32_t nfrags, hwbuf_size, frag_size, tsched_size, tsched_watermark;
@ -1116,6 +1116,11 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const pa_alsa_profil
if (profile) { if (profile) {
if (!(dev_id = pa_modargs_get_value(ma, "device_id", NULL))) {
pa_log("device_id= not set");
goto fail;
}
if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile( if (!(u->pcm_handle = pa_alsa_open_by_device_id_profile(
dev_id, dev_id,
&u->device_name, &u->device_name,