summaryrefslogtreecommitdiff
path: root/audio/sink.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2009-04-02 17:30:31 +0300
committerJohan Hedberg <johan.hedberg@nokia.com>2009-04-02 17:30:31 +0300
commit1200c9362b09dcc0cd362c046b93c560a7a47256 (patch)
treebef173f6b9f98e85aa56bbed543ca5492c5c77ef /audio/sink.c
parent4dae3bff67e8b5be23c99919dfc8e0f4c24f7b77 (diff)
downloadbluez-1200c9362b09dcc0cd362c046b93c560a7a47256.tar.gz
Fix disconnection timers for org.bluez.Audio
The original org.bluez.Audio patch forgot to make sure that the disconnection timers for Headset and AudioSink get disabled when org.bluez.Audio.Connect is used. This patch fixes it.
Diffstat (limited to 'audio/sink.c')
-rw-r--r--audio/sink.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/sink.c b/audio/sink.c
index 7f8286dfa..afdfde652 100644
--- a/audio/sink.c
+++ b/audio/sink.c
@@ -507,6 +507,8 @@ gboolean sink_setup_stream(struct sink *sink, struct avdtp *session)
if (!sink->session)
return FALSE;
+ avdtp_set_auto_disconnect(sink->session, FALSE);
+
if (avdtp_discover(sink->session, discovery_complete, sink) < 0)
return FALSE;
@@ -538,8 +540,6 @@ static DBusMessage *sink_connect(DBusConnection *conn,
".AlreadyConnected",
"Device Already Connected");
- avdtp_set_auto_disconnect(sink->session, FALSE);
-
if (!sink_setup_stream(sink, NULL))
return g_dbus_create_error(msg, ERROR_INTERFACE ".Failed",
"Failed to create a stream");