[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: module-combine-sink: Do not set up rate adjustment timer at load time

[PulseAudio Marge Bot (@pulseaudio-merge-bot)]

PulseAudio Marge Bot pushed to branch master at PulseAudio / pulseaudio


Commits:
37c72c20 by Igor V. Kovalenko at 2022-11-27T22:31:51+03:00
module-combine-sink: Do not set up rate adjustment timer at load time

Rate adjustment timer is set up when combine sink is resumed and relased when
combine sink is suspended. Do not create this timer again while module is loaded
to prevent duplicate effort causing assertion in time_callback.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756>

- - - - -
0cbbc408 by Igor V. Kovalenko at 2022-11-27T22:47:30+03:00
module-combine-sink: Suspend while unloading to fix crash moving sinks

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/756>

- - - - -


1 changed file:

- src/modules/module-combine-sink.c


Changes:

=====================================
src/modules/module-combine-sink.c
=====================================
@@ -1711,9 +1711,6 @@ int pa__init(pa_module*m) {
     PA_IDXSET_FOREACH(o, u->outputs, idx)
         output_verify(o);
 
-    if (u->adjust_time > 0)
-        u->time_event = pa_core_rttime_new(m->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
-
     pa_modargs_free(ma);
 
     return 0;
@@ -1736,6 +1733,9 @@ void pa__done(pa_module*m) {
     if (!(u = m->userdata))
         return;
 
+    if (u->sink && PA_SINK_IS_LINKED(u->sink->state))
+        pa_sink_suspend(u->sink, true, PA_SUSPEND_UNAVAILABLE);
+
     pa_strlist_free(u->unlinked_slaves);
 
     if (u->sink_put_slot)



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/3c63f8e6dca855177d9fb75b735976ff3c7a88fb...0cbbc408aee2b5f2c42280d24dc615405387b5b1

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/3c63f8e6dca855177d9fb75b735976ff3c7a88fb...0cbbc408aee2b5f2c42280d24dc615405387b5b1
You're receiving this email because of your account on gitlab.freedesktop.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20221127/487a3c7b/attachment-0001.htm>