mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Add pa_bluetooth_transport_set_state

Browse source
This commit is contained in:
Luiz Augusto von Dentz 2014-09-08 12:14:42 +03:00 • committed by Tanu Kaskinen
parent 610704d225
commit 4e041f7b36
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/modules/bluetooth/bluez5-util.c
View file

@ -167,7 +167,7 @@ static const char *transport_state_to_string(pa_bluetooth_transport_state_t stat
return "invalid"; return "invalid";
} }
static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state) { void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state) {
bool old_any_connected; bool old_any_connected;
pa_assert(t); pa_assert(t);
@ -183,6 +183,8 @@ static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_tran
t->state = state; t->state = state;
if (state == PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED) if (state == PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED)
t->device->transports[t->profile] = NULL; t->device->transports[t->profile] = NULL;
else
t->device->transports[t->profile] = t;
pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED], t); pa_hook_fire(&t->device->discovery->hooks[PA_BLUETOOTH_HOOK_TRANSPORT_STATE_CHANGED], t);
@ -191,7 +193,7 @@ static void transport_state_changed(pa_bluetooth_transport *t, pa_bluetooth_tran
} }
void pa_bluetooth_transport_put(pa_bluetooth_transport *t) { void pa_bluetooth_transport_put(pa_bluetooth_transport *t) {
transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_IDLE); pa_bluetooth_transport_set_state(t, PA_BLUETOOTH_TRANSPORT_STATE_IDLE);
} }
void pa_bluetooth_transport_free(pa_bluetooth_transport *t) { void pa_bluetooth_transport_free(pa_bluetooth_transport *t) {
@ -328,7 +330,7 @@ static void parse_transport_property(pa_bluetooth_transport *t, DBusMessageIter
return; return;
} }
transport_state_changed(t, state); pa_bluetooth_transport_set_state(t, state);
} }
break; break;
@ -412,7 +414,7 @@ static void device_free(pa_bluetooth_device *d) {
if (!(t = d->transports[i])) if (!(t = d->transports[i]))
continue; continue;
transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED); pa_bluetooth_transport_set_state(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED);
pa_bluetooth_transport_free(t); pa_bluetooth_transport_free(t);
} }
@ -1270,7 +1272,7 @@ static DBusMessage *endpoint_set_configuration(DBusConnection *conn, DBusMessage
pa_assert_se(dbus_connection_send(pa_dbus_connection_get(y->connection), r, NULL)); pa_assert_se(dbus_connection_send(pa_dbus_connection_get(y->connection), r, NULL));
dbus_message_unref(r); dbus_message_unref(r);
d->transports[p] = t = pa_bluetooth_transport_new(d, sender, path, p, config, size); t = pa_bluetooth_transport_new(d, sender, path, p, config, size);
t->acquire = bluez5_transport_acquire_cb; t->acquire = bluez5_transport_acquire_cb;
t->release = bluez5_transport_release_cb; t->release = bluez5_transport_release_cb;
pa_bluetooth_transport_put(t); pa_bluetooth_transport_put(t);
@ -1433,7 +1435,7 @@ static DBusMessage *endpoint_clear_configuration(DBusConnection *conn, DBusMessa
if ((t = pa_hashmap_get(y->transports, path))) { if ((t = pa_hashmap_get(y->transports, path))) {
pa_log_debug("Clearing transport %s profile %s", t->path, pa_bluetooth_profile_to_string(t->profile)); pa_log_debug("Clearing transport %s profile %s", t->path, pa_bluetooth_profile_to_string(t->profile));
transport_state_changed(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED); pa_bluetooth_transport_set_state(t, PA_BLUETOOTH_TRANSPORT_STATE_DISCONNECTED);
pa_bluetooth_transport_free(t); pa_bluetooth_transport_free(t);
} }

1
src/modules/bluetooth/bluez5-util.h
View file

@ -112,6 +112,7 @@ void pa_bluetooth_backend_free(pa_bluetooth_backend *b);
pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const char *owner, const char *path, pa_bluetooth_transport *pa_bluetooth_transport_new(pa_bluetooth_device *d, const char *owner, const char *path,
pa_bluetooth_profile_t p, const uint8_t *config, size_t size); pa_bluetooth_profile_t p, const uint8_t *config, size_t size);
void pa_bluetooth_transport_set_state(pa_bluetooth_transport *t, pa_bluetooth_transport_state_t state);
void pa_bluetooth_transport_put(pa_bluetooth_transport *t); void pa_bluetooth_transport_put(pa_bluetooth_transport *t);
void pa_bluetooth_transport_free(pa_bluetooth_transport *t); void pa_bluetooth_transport_free(pa_bluetooth_transport *t);