Antonio Larrosa
77255f9033
- Add several patches from upstream to fix several issues (glfo#pipewire/pipewire#2925, glfo#pipewire/pipewire#2928, glfo#pipewire/pipewire#2929): * 0001-module-rt-fix-warning-when-xdg-desktop-portal-isnt-running.patch * 0001-midifile-error-won-invalid-track-size.patch * 0001-impl-node-move-2-state-variables-to-private.patch * 0001-context-rename-a-method.patch * 0002-impl-node-restore-running-state-after-reconfigure.patch * 0001-context-keep-per-node-quantum-and-rate-settings.patch * 0001-fix-use_buffers-checks.patch * 0001-pulse-server-clear-the-drained-state-correctly.patch OBS-URL: https://build.opensuse.org/request/show/1057763 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pipewire?expand=0&rev=102
65 lines
1.9 KiB
Diff
65 lines
1.9 KiB
Diff
From 07633f2146e2aa66fad8edb2b3e8495d813a0834 Mon Sep 17 00:00:00 2001
|
|
From: Wim Taymans <wtaymans@redhat.com>
|
|
Date: Mon, 9 Jan 2023 11:06:37 +0100
|
|
Subject: [PATCH] context: rename a method
|
|
|
|
Rename suspend_driver -> reconfigure_driver because that is more like
|
|
what it does.
|
|
---
|
|
src/pipewire/context.c | 14 +++++++-------
|
|
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/pipewire/context.c b/src/pipewire/context.c
|
|
index 39f224a60..2301d34ad 100644
|
|
--- a/src/pipewire/context.c
|
|
+++ b/src/pipewire/context.c
|
|
@@ -933,7 +933,7 @@ static inline uint32_t *get_rates(struct pw_context *context, uint32_t *def, uin
|
|
return s->clock_rates;
|
|
}
|
|
}
|
|
-static void suspend_driver(struct pw_context *context, struct pw_impl_node *n)
|
|
+static void reconfigure_driver(struct pw_context *context, struct pw_impl_node *n)
|
|
{
|
|
struct pw_impl_node *s;
|
|
|
|
@@ -1199,7 +1199,7 @@ again:
|
|
}
|
|
|
|
if (target_rate != current_rate) {
|
|
- bool do_suspend = false;
|
|
+ bool do_reconfigure = false;
|
|
/* we doing a rate switch */
|
|
pw_log_info("(%s-%u) state:%s new rate:%u->%u",
|
|
n->name, n->info.id,
|
|
@@ -1209,13 +1209,13 @@ again:
|
|
|
|
if (force_rate) {
|
|
if (settings->clock_rate_update_mode == CLOCK_RATE_UPDATE_MODE_HARD)
|
|
- do_suspend = true;
|
|
+ do_reconfigure = true;
|
|
} else {
|
|
if (n->info.state >= PW_NODE_STATE_SUSPENDED)
|
|
- do_suspend = true;
|
|
+ do_reconfigure = true;
|
|
}
|
|
- if (do_suspend)
|
|
- suspend_driver(context, n);
|
|
+ if (do_reconfigure)
|
|
+ reconfigure_driver(context, n);
|
|
#
|
|
/* we're setting the pending rate. This will become the new
|
|
* current rate in the next iteration of the graph. */
|
|
n->current_rate = SPA_FRACTION(1, target_rate);
|
|
@@ -1223,7 +1223,7 @@ again:
|
|
n->current_pending = true;
|
|
current_rate = target_rate;
|
|
/* we might be suspended now and the links need to be prepared again */
|
|
- if (do_suspend)
|
|
+ if (do_reconfigure)
|
|
goto again;
|
|
}
|
|
|
|
--
|
|
GitLab
|
|
|