mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
make module-hal and module-ck live together in peace
This commit is contained in:
parent
49f09d6d0e
commit
e3fb086681
2 changed files with 8 additions and 2 deletions
|
|
@ -615,6 +615,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
|
|||
device_added_cb(u->context, udi);
|
||||
}
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
|
||||
} else if (dbus_message_is_signal(message, "org.pulseaudio.Server", "DirtyGiveUpMessage")) {
|
||||
/* We use this message to avoid a dirty race condition when we
|
||||
get an ACLAdded message before the previously owning PA
|
||||
|
|
@ -661,12 +663,14 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
|
|||
} else
|
||||
/* Yes, we don't check the UDI for validity, but hopefully HAL will */
|
||||
device_added_cb(u->context, udi);
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
|
||||
finish:
|
||||
dbus_error_free(&error);
|
||||
|
||||
return DBUS_HANDLER_RESULT_HANDLED;
|
||||
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
|
||||
}
|
||||
|
||||
static void hal_context_free(LibHalContext* hal_context) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue