mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: clear last error before sync

Browse source 
We are really interested in the error code of the statements we queued
before the sync so clear any previous error first. Otherwise we might
pick up a previous random error, which never gets cleared.

See #1714
This commit is contained in:
Wim Taymans 2022-03-26 21:35:28 +01:00
parent b225fe1d54
commit 36185b830a
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pipewire-jack/src/pipewire-jack.c
View file

@ -298,7 +298,6 @@ struct client {
int pending_sync; int pending_sync;
int last_sync; int last_sync;
int last_res; int last_res;
bool error;
struct spa_node_info info; struct spa_node_info info;
@ -845,7 +844,6 @@ static void on_error(void *data, uint32_t id, int seq, int res, const char *mess
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) { if (id == PW_ID_CORE) {
client->error = true;
client->last_res = res; client->last_res = res;
if (!client->destroyed) if (!client->destroyed)
do_callback(client, shutdown_callback, client->shutdown_arg); do_callback(client, shutdown_callback, client->shutdown_arg);
@ -867,9 +865,8 @@ static int do_sync(struct client *client)
pw_log_warn("sync requested from callback"); pw_log_warn("sync requested from callback");
return 0; return 0;
} }
if (client->error)
return client->last_res;
client->last_res = 0;
client->pending_sync = pw_proxy_sync((struct pw_proxy*)client->core, client->pending_sync); client->pending_sync = pw_proxy_sync((struct pw_proxy*)client->core, client->pending_sync);
while (true) { while (true) {
@ -881,7 +878,7 @@ static int do_sync(struct client *client)
if (in_data_thread && client->rt_locked) if (in_data_thread && client->rt_locked)
pthread_mutex_lock(&client->rt_lock); pthread_mutex_lock(&client->rt_lock);
if (client->error) if (client->last_res < 0)
return client->last_res; return client->last_res;
if (client->pending_sync == client->last_sync) if (client->pending_sync == client->last_sync)
@ -3314,7 +3311,7 @@ jack_client_t * jack_client_open (const char *client_name,
while (true) { while (true) {
pw_thread_loop_wait(client->context.loop); pw_thread_loop_wait(client->context.loop);
if (client->error) if (client->last_res < 0)
goto init_failed; goto init_failed;
if (client->has_transport) if (client->has_transport)