summaryrefslogtreecommitdiffstats
path: root/audio
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-10-11 13:42:59 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-10-11 13:42:59 +0000
commit8ca5098af0bd09cedf8299ee87def134ed6162e4 (patch)
tree4061f96fdb8680fb9c4ec38ebfd43a2379e42af5 /audio
parent997f32ca18683a57c1e0ca83cf17214335b5f4c3 (diff)
Remove stream idle timer
Diffstat (limited to 'audio')
-rw-r--r--audio/avdtp.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/audio/avdtp.c b/audio/avdtp.c
index 0fb64bb0..1ffabd94 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -74,7 +74,6 @@
#define REQ_TIMEOUT 4000
#define DISCONNECT_TIMEOUT 5000
-#define STREAM_TIMEOUT 20000
typedef enum {
AVDTP_SESSION_STATE_DISCONNECTED,
@@ -318,7 +317,6 @@ struct avdtp_stream {
the transport channel */
gboolean open_acp; /* If we are in ACT role for Open */
gboolean close_int; /* If we are in INT role for Close */
- guint idle_timer;
};
/* Structure describing an AVDTP connection between two devices */
@@ -571,17 +569,6 @@ static void stream_free(struct avdtp_stream *stream)
g_free(stream);
}
-static gboolean stream_timeout(struct avdtp_stream *stream)
-{
- struct avdtp *session = stream->session;
-
- avdtp_close(session, stream);
-
- stream->idle_timer = 0;
-
- return FALSE;
-}
-
static gboolean transport_cb(GIOChannel *chan, GIOCondition cond,
gpointer data)
{
@@ -669,23 +656,12 @@ static void avdtp_sep_set_state(struct avdtp *session,
switch (state) {
case AVDTP_STATE_OPEN:
- stream->idle_timer = g_timeout_add(STREAM_TIMEOUT,
- (GSourceFunc) stream_timeout,
- stream);
break;
case AVDTP_STATE_STREAMING:
case AVDTP_STATE_CLOSING:
case AVDTP_STATE_ABORTING:
- if (stream->idle_timer) {
- g_source_remove(stream->idle_timer);
- stream->idle_timer = 0;
- }
break;
case AVDTP_STATE_IDLE:
- if (stream->idle_timer) {
- g_source_remove(stream->idle_timer);
- stream->idle_timer = 0;
- }
session->streams = g_slist_remove(session->streams, stream);
if (session->pending_open == stream)
handle_transport_connect(session, -1, 0);