Cleanup and fixes of stream handling

1 files changed, 3 insertions, 5 deletions

diff --git a/audio/a2dp.h b/audio/a2dp.h
index ede0c70b..6a966302 100644
--- a/audio/a2dp.h
+++ b/audio/a2dp.h
@@ -60,7 +60,7 @@ struct sbc_codec_cap {
 
 struct a2dp_sep;
 
-typedef void (*a2dp_stream_cb_t) (struct avdtp *session, struct device *dev,
+typedef void (*a2dp_stream_cb_t) (struct avdtp *session, struct a2dp_sep *sep,
 					struct avdtp_stream *stream,
 					void *user_data);
 
@@ -68,14 +68,12 @@ int a2dp_init(DBusConnection *conn, int sources, int sinks);
 void a2dp_exit(void);
 
 unsigned int a2dp_source_request_stream(struct avdtp *session,
-					struct device *dev,
 					gboolean start, a2dp_stream_cb_t cb,
 					void *user_data,
-					struct a2dp_sep **sep,
 					struct avdtp_service_capability *media_codec);
 gboolean a2dp_source_cancel_stream(struct device *dev, unsigned int id);
 
-gboolean a2dp_source_lock(struct device *dev, struct avdtp *session);
-gboolean a2dp_source_unlock(struct device *dev, struct avdtp *session);
+gboolean a2dp_sep_lock(struct a2dp_sep *sep, struct avdtp *session);
+gboolean a2dp_sep_unlock(struct a2dp_sep *sep, struct avdtp *session);
 gboolean a2dp_source_suspend(struct device *dev, struct avdtp *session);
 gboolean a2dp_source_start_stream(struct device *dev, struct avdtp *session);