mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluez5: midi: refcounting and other correctness fixes

Browse source 
Use stdalign.h instead of union.
Fix some refcounting and return values.
Fail early in add_filters.
Minor style cleanups.
Less magical spa_dbus_async_call.
This commit is contained in:
Pauli Virtanen 2022-11-10 21:25:42 +02:00 • committed by Wim Taymans
parent 2f8691b64f
commit bd45f846fc
6 changed files with 105 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

10
spa/plugins/bluez5/midi-node.c
View file

@ -151,7 +151,7 @@ struct port {
struct time_sync sync;
unsigned int acquired:1;
DBusPendingCall *acquire_call;
struct spa_dbus_async_call acquire_call;
struct spa_source source;
@ -919,9 +919,9 @@ static int do_release(struct impl *this);
static int do_stop(struct impl *this);
static void acquire_reply(DBusPendingCall **call_ptr, DBusMessage *r)
static void acquire_reply(struct spa_dbus_async_call *call, DBusMessage *r)
{
struct port *port = SPA_CONTAINER_OF(call_ptr, struct port, acquire_call);
struct port *port = SPA_CONTAINER_OF(call, struct port, acquire_call);
struct impl *this = port->impl;
const char *method = (port->direction == SPA_DIRECTION_OUTPUT) ?
"AcquireNotify" : "AcquireWrite";
@ -977,7 +977,7 @@ static int do_acquire(struct port *port)
if (port->acquired)
return 0;
if (port->acquire_call)
if (port->acquire_call.pending)
return 0;
spa_log_info(this->log,
@ -995,7 +995,7 @@ static int do_acquire(struct port *port)
dbus_message_iter_open_container(&i, DBUS_TYPE_ARRAY, "{sv}", &d);
dbus_message_iter_close_container(&i, &d);
return spa_dbus_async_call(this->conn, m, &port->acquire_call,
return spa_dbus_async_call_send(&port->acquire_call, this->conn, m,
acquire_reply);
}