Accepting request 583453 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/583453
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=150
This commit is contained in:
Dominique Leuenberger 2018-03-08 09:56:11 +00:00 committed by Git OBS Bridge
commit 45da7a2044
2 changed files with 13 additions and 8 deletions

View File

@ -16,10 +16,10 @@ cause is added: PA_SUSPEND_UNAVAILABLE.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
---
src/modules/alsa/alsa-mixer.h | 1 +
src/modules/alsa/alsa-sink.c | 22 ++++++++++++++++++++++
src/modules/alsa/alsa-sink.c | 20 ++++++++++++++++++++
src/modules/alsa/module-alsa-card.c | 34 ++++++++++++++++++++++++++++++++++
src/pulsecore/core.h | 1 +
4 files changed, 58 insertions(+)
4 files changed, 56 insertions(+)
--- a/src/modules/alsa/alsa-mixer.h
+++ b/src/modules/alsa/alsa-mixer.h
@ -33,19 +33,17 @@ BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=100488
void pa_alsa_add_ports(void *sink_or_source_new_data, pa_alsa_path_set *ps, pa_card *card);
--- a/src/modules/alsa/alsa-sink.c
+++ b/src/modules/alsa/alsa-sink.c
@@ -1513,6 +1513,11 @@ static int sink_set_port_cb(pa_sink *s,
@@ -1513,6 +1513,9 @@ static int sink_set_port_cb(pa_sink *s,
s->set_volume(s);
}
+ if (data->suspend_when_unavailable && p->available == PA_AVAILABLE_NO)
+ pa_sink_suspend(s, true, PA_SUSPEND_UNAVAILABLE);
+ else
+ pa_sink_suspend(s, false, PA_SUSPEND_UNAVAILABLE);
+ if (data->suspend_when_unavailable)
+ pa_sink_suspend(s, p->available == PA_AVAILABLE_NO, PA_SUSPEND_UNAVAILABLE);
+
return 0;
}
@@ -2455,6 +2460,23 @@ pa_sink *pa_alsa_sink_new(pa_module *m,
@@ -2455,6 +2458,23 @@ pa_sink *pa_alsa_sink_new(pa_module *m,
if (profile_set)
pa_alsa_profile_set_free(profile_set);

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Mar 6 08:23:40 CET 2018 - tiwai@suse.de
- Fix the wrongly suspended sinks due to the previous patch
(bsc#1084047):
refreshed 0001-alsa-fix-infinite-loop-with-Intel-HDMI-LPE.patch
-------------------------------------------------------------------
Thu Mar 1 10:53:15 CET 2018 - tiwai@suse.de