summaryrefslogtreecommitdiffstats
path: root/audio/unix.c
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@nokia.com>2007-08-16 19:24:07 +0000
committerJohan Hedberg <johan.hedberg@nokia.com>2007-08-16 19:24:07 +0000
commit871c0518ec53309a38debbb86a36c035c3470fba (patch)
tree823aa033bccb92f76735079312d0e4274b8313e9 /audio/unix.c
parent8ae40e0b0046a011bbc15771f248d7950a606ae4 (diff)
Revert changes from previous commit that were not supposed to go in
Diffstat (limited to 'audio/unix.c')
-rw-r--r--audio/unix.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/audio/unix.c b/audio/unix.c
index 0e5fd5c1..10856b93 100644
--- a/audio/unix.c
+++ b/audio/unix.c
@@ -140,30 +140,6 @@ static service_type_t select_service(struct device *dev)
return TYPE_NONE;
}
-
-static void stream_state_changed(struct avdtp_stream *stream,
- avdtp_state_t old_state,
- avdtp_state_t new_state,
- struct avdtp_error *err,
- void *user_data)
-{
- struct unix_client *client = user_data;
-
- if (err)
- return;
-
- switch (new_state) {
- case AVDTP_STATE_IDLE:
- if (client->data.session) {
- avdtp_unref(client->data.session);
- client->data.session = NULL;
- }
- break;
- default:
- break;
- }
-}
-
static void a2dp_setup_complete(struct avdtp *session, struct device *dev,
struct avdtp_stream *stream,
void *user_data)
@@ -247,15 +223,11 @@ static void a2dp_setup_complete(struct avdtp *session, struct device *dev,
unix_send_cfg(client->sock, cfg, fd);
- avdtp_stream_add_cb(session, stream, stream_state_changed, dev);
-
return;
failed:
unix_send_cfg(client->sock, NULL, -1);
a2dp_source_unlock(dev, session);
- avdtp_unref(client->data.session);
- client->data.session = NULL;
}
static void cfg_event(struct unix_client *client, struct ipc_packet *pkt,