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

handle core error better

Browse source 
Use the PW_ID_CORE constant
Quit the mainloop when server disconnected in the tools

See #395
This commit is contained in:
Wim Taymans 2020-11-20 12:29:51 +01:00
parent 387009e0d6
commit b3aa346063
11 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/examples/bluez-session.c
View file

@ -346,10 +346,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PA_ID_CORE && res == -EPIPE)
pw_main_loop_quit(impl->loop); pw_main_loop_quit(impl->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/examples/export-sink.c
View file

@ -502,10 +502,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PA_ID_CORE
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/examples/export-source.c
View file

@ -494,10 +494,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PA_ID_CORE
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/examples/export-spa-device.c
View file

@ -77,10 +77,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PA_ID_CORE)
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/examples/export-spa.c
View file

@ -111,10 +111,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PA_ID_CORE)
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

1
src/tools/pw-cat.c
View file

@ -635,6 +635,7 @@ static void on_core_error(void *userdata, uint32_t id, int seq, int res, const c
fprintf(stderr, "remote error: id=%"PRIu32" seq:%d res:%d (%s): %s\n", fprintf(stderr, "remote error: id=%"PRIu32" seq:%d res:%d (%s): %s\n",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
} }

3
src/tools/pw-cli.c
View file

@ -413,10 +413,9 @@ static void on_core_error(void *_data, uint32_t id, int seq, int res, const char
pw_log_error("remote %p: error id:%u seq:%d res:%d (%s): %s", rd, pw_log_error("remote %p: error id:%u seq:%d res:%d (%s): %s", rd,
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
} }
}
static const struct pw_core_events remote_core_events = { static const struct pw_core_events remote_core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/tools/pw-dot.c
View file

@ -727,10 +727,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

3
src/tools/pw-metadata.c
View file

@ -146,10 +146,9 @@ static void on_core_error(void *data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) { if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(d->loop); pw_main_loop_quit(d->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

4
src/tools/pw-mon.c
View file

@ -662,10 +662,10 @@ static void on_core_error(void *_data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
} }
}
static const struct pw_core_events core_events = { static const struct pw_core_events core_events = {
PW_VERSION_CORE_EVENTS, PW_VERSION_CORE_EVENTS,

2
src/tools/pw-profiler.c
View file

@ -508,7 +508,7 @@ static void on_core_error(void *_data, uint32_t id, int seq, int res, const char
pw_log_error("error id:%u seq:%d res:%d (%s): %s", pw_log_error("error id:%u seq:%d res:%d (%s): %s",
id, seq, res, spa_strerror(res), message); id, seq, res, spa_strerror(res), message);
if (id == PW_ID_CORE) if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop); pw_main_loop_quit(data->loop);
} }