mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

reserve: return better error from rd_device_acquire

Browse source 
When we have the device, return 0
When the device is busy, return -EBUSY
When we can't send the message or something is wrong, return -EIO
This commit is contained in:
Wim Taymans 2021-05-17 10:32:55 +02:00
parent 212c2697e1
commit 88517fe24c
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/examples/media-session/reserve.c
View file

@ -189,7 +189,6 @@ static DBusHandlerResult object_handler(DBusConnection *c, DBusMessage *m, void
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_HANDLED;
} }
} else if (dbus_message_is_method_call( } else if (dbus_message_is_method_call(
m, m,
"org.freedesktop.DBus.Introspectable", "org.freedesktop.DBus.Introspectable",
@ -244,7 +243,6 @@ static const struct DBusObjectPathVTable vtable ={
static DBusHandlerResult filter_handler(DBusConnection *c, DBusMessage *m, void *userdata) static DBusHandlerResult filter_handler(DBusConnection *c, DBusMessage *m, void *userdata)
{ {
struct rd_device *d = userdata; struct rd_device *d = userdata;
DBusError error; DBusError error;
const char *name; const char *name;
@ -401,13 +399,22 @@ int rd_device_acquire(struct rd_device *d)
d->service_name, d->service_name,
(d->priority < INT32_MAX ? DBUS_NAME_FLAG_ALLOW_REPLACEMENT : 0), (d->priority < INT32_MAX ? DBUS_NAME_FLAG_ALLOW_REPLACEMENT : 0),
&error)) < 0) { &error)) < 0) {
pw_log_warn(NAME"%p: reserve failed: %s", d, error.message);
dbus_error_free(&error); dbus_error_free(&error);
return -EIO;
} }
if (res != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) pw_log_debug(NAME"%p: reserve result: %d", d, res);
if (res == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER ||
res == DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER)
return 0;
if (res == DBUS_REQUEST_NAME_REPLY_EXISTS ||
res == DBUS_REQUEST_NAME_REPLY_IN_QUEUE)
return -EBUSY; return -EBUSY;
return 0; return -EIO;
} }
int rd_device_request_release(struct rd_device *d) int rd_device_request_release(struct rd_device *d)
@ -430,7 +437,7 @@ int rd_device_request_release(struct rd_device *d)
return -ENOMEM; return -ENOMEM;
} }
if (!dbus_connection_send(d->connection, m, NULL)) { if (!dbus_connection_send(d->connection, m, NULL)) {
return -ENOMEM; return -EIO;
} }
return 0; return 0;
} }
@ -452,7 +459,7 @@ int rd_device_complete_release(struct rd_device *d, int res)
} }
if (!dbus_connection_send(d->connection, d->reply, NULL)) { if (!dbus_connection_send(d->connection, d->reply, NULL)) {
res = -ENOMEM; res = -EIO;
goto exit; goto exit;
} }
res = 0; res = 0;