mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-02 09:01:50 -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,9 +346,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PA_ID_CORE && res == -EPIPE)
pw_main_loop_quit(impl->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -502,9 +502,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PA_ID_CORE
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -494,9 +494,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PA_ID_CORE
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -77,9 +77,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PA_ID_CORE)
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -111,9 +111,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PA_ID_CORE)
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -635,7 +635,8 @@ 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",
id, seq, res, spa_strerror(res), message);
pw_main_loop_quit(data->loop);
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop);
}
static const struct pw_core_events core_events = {

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

@ -413,9 +413,8 @@ 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,
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop);
}
}
static const struct pw_core_events remote_core_events = {

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

@ -727,9 +727,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -146,9 +146,8 @@ 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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(d->loop);
}
}
static const struct pw_core_events core_events = {

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

@ -662,9 +662,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",
id, seq, res, spa_strerror(res), message);
if (id == 0) {
if (id == PW_ID_CORE && res == -EPIPE)
pw_main_loop_quit(data->loop);
}
}
static const struct pw_core_events 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",
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);
}