Merge commit 'elmarco/bluetooth-fixes'

This commit is contained in:
Lennart Poettering 2009-03-30 20:34:49 +02:00
commit 1390564227
8 changed files with 275 additions and 131 deletions

View file

@ -84,8 +84,7 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
mi = pa_hashmap_get(u->hashmap, d->path);
if (!d->dead &&
d->device_connected > 0 &&
(d->audio_sink_connected > 0 || d->headset_connected > 0)) {
d->device_connected > 0 && d->audio_state >= PA_BT_AUDIO_STATE_CONNECTED) {
if (!mi) {
pa_module *m = NULL;
@ -93,7 +92,16 @@ static pa_hook_result_t load_module_for_device(pa_bluetooth_discovery *y, const
/* Oh, awesome, a new device has shown up and been connected! */
args = pa_sprintf_malloc("address=\"%s\" path=\"%s\" profile=\"%s\"", d->address, d->path, d->headset_connected ? "hsp" : "a2dp");
args = pa_sprintf_malloc("address=\"%s\" path=\"%s\"", d->address, d->path);
#if 0
/* This is in case we have to use hsp immediately, without waiting for .Audio.State = Connected */
if (d->headset_state >= PA_BT_AUDIO_STATE_CONNECTED && somecondition) {
char *tmp;
tmp = pa_sprintf_malloc("%s profile=\"hsp\"", args);
pa_xfree(args);
args = tmp;
}
#endif
#ifdef NOKIA
if (pa_modargs_get_value(u->modargs, "sco_sink", NULL) &&