korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-29 15:14:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wait SCO socket to HUP before changing state

Browse Source 
In situations where application wants to switch profiles e.g HFP to A2DP
it normally needs to wait SCO to be disconnected to resume A2DP due to
resource limitations on headset.

There seems to be an issue in the kernel side which prevent this to work
properly, apparently shutdown does not wait the link to be disconnected,
but it is under investigation.
This commit is contained in:
Luiz Augusto von Dentz 2011-03-24 14:09:53 +02:00 committed by Johan Hedberg
parent aef577312e
commit d3f69537a4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/headset.c
View File

@ -1345,6 +1345,7 @@ static gboolean sco_cb(GIOChannel *chan, GIOCondition cond,
error("Audio connection got disconnected");
pending_connect_finalize(device);
headset_set_state(device, HEADSET_STATE_CONNECTED);
return FALSE;
@ -2385,6 +2386,7 @@ unsigned int headset_suspend_stream(struct audio_device *dev,
{
struct headset *hs = dev->headset;
unsigned int id;
int sock;
if (hs->state == HEADSET_STATE_DISCONNECTED ||
hs->state == HEADSET_STATE_CONNECTING)
@ -2395,10 +2397,12 @@ unsigned int headset_suspend_stream(struct audio_device *dev,
hs->dc_timer = 0;
}
headset_set_state(dev, HEADSET_STATE_CONNECTED);
sock = g_io_channel_unix_get_fd(hs->sco);
/* shutdown but leave the socket open and wait for hup */
shutdown(sock, SHUT_RDWR);
id = connect_cb_new(hs, HEADSET_STATE_CONNECTED, cb, user_data);
g_idle_add((GSourceFunc) dummy_connect_complete, dev);
return id;
}