mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Ignore Device.Connected

Browse source 
The Device.Connected was only used for tracking whether a device module
should be loaded, but that information is already included in the
individual profile state properties. The property can therefore be
completely ignored without any loss in functionality.
This commit is contained in:
Tanu Kaskinen 2012-11-22 15:20:24 +01:00
parent 55baf5424e
commit 6545cc77f4
3 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/bluetooth/bluetooth-util.c
View file

@ -128,7 +128,6 @@ static pa_bluetooth_device* device_new(pa_bluetooth_discovery *discovery, const
d->transports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); d->transports = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func);
d->paired = -1; d->paired = -1;
d->alias = NULL; d->alias = NULL;
d->device_connected = -1;
PA_LLIST_HEAD_INIT(pa_bluetooth_uuid, d->uuids); PA_LLIST_HEAD_INIT(pa_bluetooth_uuid, d->uuids);
d->address = NULL; d->address = NULL;
d->class = -1; d->class = -1;
@ -348,8 +347,6 @@ static int parse_device_property(pa_bluetooth_device *d, DBusMessageIter *i) {
if (pa_streq(key, "Paired")) if (pa_streq(key, "Paired"))
d->paired = !!value; d->paired = !!value;
else if (pa_streq(key, "Connected"))
d->device_connected = !!value;
else if (pa_streq(key, "Trusted")) else if (pa_streq(key, "Trusted"))
d->trusted = !!value; d->trusted = !!value;

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

@ -110,7 +110,6 @@ struct pa_bluetooth_device {
pa_hashmap *transports; pa_hashmap *transports;
int paired; int paired;
char *alias; char *alias;
int device_connected;
PA_LLIST_HEAD(pa_bluetooth_uuid, uuids); PA_LLIST_HEAD(pa_bluetooth_uuid, uuids);
char *address; char *address;
int class; int class;

2
src/modules/bluetooth/module-bluetooth-discover.c
View file

@ -74,7 +74,7 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
mi = pa_hashmap_get(u->hashmap, d->path); mi = pa_hashmap_get(u->hashmap, d->path);
if (!d->dead && d->device_connected > 0 && if (!d->dead &&
(d->audio_state >= PA_BT_AUDIO_STATE_CONNECTED || (d->audio_state >= PA_BT_AUDIO_STATE_CONNECTED ||
d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED || d->audio_source_state >= PA_BT_AUDIO_STATE_CONNECTED ||
d->hfgw_state >= PA_BT_AUDIO_STATE_CONNECTED)) { d->hfgw_state >= PA_BT_AUDIO_STATE_CONNECTED)) {