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

reserve: don't call busy/available when we are the owner

Browse source 
Also ignore acquired from our other devices.
This commit is contained in:
Wim Taymans 2020-09-21 14:35:32 +02:00
parent cc470c048b
commit 2b8568e14f
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -270,10 +270,13 @@ static DBusHandlerResult filter_handler(DBusConnection *c, DBusMessage *m, void
d))) d)))
goto invalid; goto invalid;
if (d->callbacks->acquired) if (strcmp(name, d->service_name) != 0)
d->callbacks->acquired(d->data, d); goto invalid;
d->registered = true; d->registered = true;
if (d->callbacks->acquired)
d->callbacks->acquired(d->data, d);
} }
} else if (dbus_message_is_signal(m, "org.freedesktop.DBus", "NameLost")) { } else if (dbus_message_is_signal(m, "org.freedesktop.DBus", "NameLost")) {
if (!dbus_message_get_args( m, &error, if (!dbus_message_get_args( m, &error,
@ -303,17 +306,17 @@ static DBusHandlerResult filter_handler(DBusConnection *c, DBusMessage *m, void
DBUS_TYPE_INVALID)) DBUS_TYPE_INVALID))
goto invalid; goto invalid;
if (strcmp(name, d->service_name) != 0) if (strcmp(name, d->service_name) != 0 || d->owning)
goto invalid; goto invalid;
pw_log_debug(NAME" %p: changed %s: %s -> %s", d, name, old, new); pw_log_debug(NAME" %p: changed %s: %s -> %s", d, name, old, new);
if (old == NULL || *old == 0) { if (old == NULL || *old == 0) {
if (d->callbacks->busy) if (d->callbacks->busy)
d->callbacks->busy(d->data, d, new, 0); d->callbacks->busy(d->data, d, name, 0);
} else { } else {
if (d->callbacks->available) if (d->callbacks->available)
d->callbacks->available(d->data, d, old); d->callbacks->available(d->data, d, name);
} }
} }