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

fix device reservation for system mode

Browse source
This commit is contained in:
Lennart Poettering 2009-03-03 22:26:15 +01:00
parent 0329edd179
commit f3de61edf6
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -164,6 +164,9 @@ static int reserve_init(struct userdata *u, const char *dname) {
if (u->reserve) if (u->reserve)
return 0; return 0;
if (pa_in_system_mode())
return 0;
/* We are resuming, try to lock the device */ /* We are resuming, try to lock the device */
if (!(rname = pa_alsa_get_reserve_name(dname))) if (!(rname = pa_alsa_get_reserve_name(dname)))
return 0; return 0;

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

@ -162,6 +162,9 @@ static int reserve_init(struct userdata *u, const char *dname) {
if (u->reserve) if (u->reserve)
return 0; return 0;
if (pa_in_system_mode())
return 0;
/* We are resuming, try to lock the device */ /* We are resuming, try to lock the device */
if (!(rname = pa_alsa_get_reserve_name(dname))) if (!(rname = pa_alsa_get_reserve_name(dname)))
return 0; return 0;

5
src/modules/alsa/module-alsa-card.c
View file

@ -310,8 +310,9 @@ int pa__init(pa_module *m) {
pa_snprintf(rname, sizeof(rname), "Audio%i", alsa_card_index); pa_snprintf(rname, sizeof(rname), "Audio%i", alsa_card_index);
if (!(reserve = pa_reserve_wrapper_get(m->core, rname))) if (!pa_in_system_mode())
goto fail; if (!(reserve = pa_reserve_wrapper_get(m->core, rname)))
goto fail;
pa_card_new_data_init(&data); pa_card_new_data_init(&data);
data.driver = __FILE__; data.driver = __FILE__;