diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2007-08-31 10:25:18 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2007-08-31 10:25:18 +0000 |
| commit | fc0d501d82773718d0f2d040f786136332c39813 (patch) | |
| tree | 44b5cc14b72a8fd393f1c67917a7d10c9985f1a9 /audio/sink.c | |
| parent | 03490d81bbe11641c47cd8e7e0c64a45db4f80f4 (diff) | |
Cleanup and fixes of stream handling
Diffstat (limited to 'audio/sink.c')
| -rw-r--r-- | audio/sink.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/audio/sink.c b/audio/sink.c index 285dc45c..ea95bcf7 100644 --- a/audio/sink.c +++ b/audio/sink.c @@ -133,11 +133,11 @@ static void stream_state_changed(struct avdtp_stream *stream, sink->state = new_state; } -static void stream_setup_complete(struct avdtp *session, struct device *dev, +static void stream_setup_complete(struct avdtp *session, struct a2dp_sep *sep, struct avdtp_stream *stream, void *user_data) { - struct sink *sink = dev->sink; + struct sink *sink = user_data; struct pending_request *pending; pending = sink->connect; @@ -185,8 +185,8 @@ static DBusHandlerResult sink_connect(DBusConnection *conn, pending->msg = dbus_message_ref(msg); sink->connect = pending; - id = a2dp_source_request_stream(sink->session, dev, FALSE, - stream_setup_complete, pending, NULL, + id = a2dp_source_request_stream(sink->session, FALSE, + stream_setup_complete, sink, NULL); if (id == 0) { pending_request_free(pending); |