From 0f458da19471c933a4105cc450c48548b72edc8e Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Thu, 16 Aug 2007 21:48:33 +0000
Subject: Handle error situations better

---
 audio/avdtp.h | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'audio/avdtp.h')

diff --git a/audio/avdtp.h b/audio/avdtp.h
index 0043c480..49907cff 100644
--- a/audio/avdtp.h
+++ b/audio/avdtp.h
@@ -96,22 +96,29 @@ typedef void (*avdtp_stream_state_cb) (struct avdtp_stream *stream,
 struct avdtp_sep_cfm {
 	void (*set_configuration) (struct avdtp *session,
 					struct avdtp_local_sep *lsep,
-					struct avdtp_stream *stream);
+					struct avdtp_stream *stream,
+					struct avdtp_error *err);
 	void (*get_configuration) (struct avdtp *session,
 					struct avdtp_local_sep *lsep,
-					struct avdtp_stream *stream);
+					struct avdtp_stream *stream,
+					struct avdtp_error *err);
 	void (*open) (struct avdtp *session, struct avdtp_local_sep *lsep,
-				struct avdtp_stream *stream);
+			struct avdtp_stream *stream, struct avdtp_error *err);
 	void (*start) (struct avdtp *session, struct avdtp_local_sep *lsep,
-			struct avdtp_stream *stream);
+			struct avdtp_stream *stream, struct avdtp_error *err);
 	void (*suspend) (struct avdtp *session, struct avdtp_local_sep *lsep,
-				struct avdtp_stream *stream);
+				struct avdtp_stream *stream,
+				struct avdtp_error *err);
 	void (*close) (struct avdtp *session, struct avdtp_local_sep *lsep,
-				struct avdtp_stream *stream);
+				struct avdtp_stream *stream,
+				struct avdtp_error *err);
 	void (*abort) (struct avdtp *session, struct avdtp_local_sep *lsep,
-				struct avdtp_stream *stream);
+				struct avdtp_stream *stream,
+				struct avdtp_error *err);
 	void (*reconfigure) (struct avdtp *session,
-				struct avdtp_local_sep *lsep);
+				struct avdtp_local_sep *lsep,
+				struct avdtp_stream *stream,
+				struct avdtp_error *err);
 };
 
 /* Callbacks for indicating when we received a new command. The return value
@@ -165,8 +172,12 @@ struct avdtp_service_capability *avdtp_get_codec(struct avdtp_remote_sep *sep);
 int avdtp_discover(struct avdtp *session, avdtp_discover_cb_t cb,
 			void *user_data);
 
-void avdtp_stream_set_cb(struct avdtp *session, struct avdtp_stream *stream,
-				avdtp_stream_state_cb cb, void *data);
+unsigned int avdtp_stream_add_cb(struct avdtp *session,
+					struct avdtp_stream *stream,
+					avdtp_stream_state_cb cb, void *data);
+gboolean avdtp_stream_remove_cb(struct avdtp *session,
+				struct avdtp_stream *stream,
+				unsigned int id);
 
 gboolean avdtp_stream_get_transport(struct avdtp_stream *stream, int *sock,
 					uint16_t *mtu, GSList **caps);
-- 
cgit