From 10c0f22adf9015cf88d298093a331464e6a883ee Mon Sep 17 00:00:00 2001
From: Derek Dai <daiderek@gmail.com>
Date: Tue, 9 May 2017 16:16:20 +0800
Subject: [PATCH] miracle-dispd: minor interface tweaks betwen wfd_session and
 wfd_out_session

Change-Id: Ib0c65ab64d543d5fce8908f6c47dbfc2acf47763
---
 src/disp/wfd-out-session.c | 12 ++++++++----
 src/disp/wfd-session.c     |  2 +-
 src/disp/wfd-session.h     |  1 +
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/disp/wfd-out-session.c b/src/disp/wfd-out-session.c
index 7e55491..3cfd87c 100644
--- a/src/disp/wfd-out-session.c
+++ b/src/disp/wfd-out-session.c
@@ -309,11 +309,12 @@ static int wfd_out_session_handle_get_parameter_reply(struct wfd_session *s,
 }
 
 static int wfd_out_session_request_get_parameter(struct wfd_session *s,
+				struct rtsp *bus,
 				const struct wfd_arg_list *args,
 				struct rtsp_message **out)
 {
 	_rtsp_message_unref_ struct rtsp_message *m = NULL;
-	int r = rtsp_message_new_request(s->rtsp,
+	int r = rtsp_message_new_request(bus,
 					&m,
 					"GET_PARAMETER",
 					"rtsp://localhost/wfd1.0");
@@ -425,11 +426,12 @@ static int wfd_out_session_handle_options_reply(struct wfd_session *s,
 }
 
 static int wfd_out_session_request_options(struct wfd_session *s,
+				struct rtsp *bus,
 				const struct wfd_arg_list *args,
 				struct rtsp_message **out)
 {
 	_rtsp_message_unref_ struct rtsp_message *m = NULL;
-	int r = rtsp_message_new_request(s->rtsp,
+	int r = rtsp_message_new_request(bus,
 					&m,
 					"OPTIONS", "*");
 	if (0 > r) {
@@ -696,6 +698,7 @@ static int wfd_out_session_handle_idr_request(struct wfd_session *s,
 }
 
 static int wfd_out_session_request_trigger(struct wfd_session *s,
+				struct rtsp *bus,
 				const struct wfd_arg_list *args,
 				struct rtsp_message **out)
 {
@@ -709,7 +712,7 @@ static int wfd_out_session_request_trigger(struct wfd_session *s,
 
 	assert(method);
 
-	r = rtsp_message_new_request(s->rtsp,
+	r = rtsp_message_new_request(bus,
 					 &m,
 					 "SET_PARAMETER",
 					 wfd_session_get_stream_url(s));
@@ -741,6 +744,7 @@ static int wfd_out_session_request_not_implement(struct wfd_session *s,
 }
 
 static int wfd_out_session_request_set_parameter(struct wfd_session *s,
+				struct rtsp *bus,
 				const struct wfd_arg_list *args,
 				struct rtsp_message **out)
 {
@@ -774,7 +778,7 @@ static int wfd_out_session_request_set_parameter(struct wfd_session *s,
 		return log_ERRNO();
 	}
 
-	r = rtsp_message_new_request(s->rtsp,
+	r = rtsp_message_new_request(bus,
 					&m,
 					"SET_PARAMETER",
 					"rtsp://localhost/wfd1.0");
diff --git a/src/disp/wfd-session.c b/src/disp/wfd-session.c
index b707b35..c576b61 100644
--- a/src/disp/wfd-session.c
+++ b/src/disp/wfd-session.c
@@ -73,7 +73,7 @@ static int wfd_session_do_request(struct wfd_session *s,
 	assert_ret(out);
 	assert_retv(s->rtsp_disp_tbl[id].request, -ENOTSUP);
 
-	r = (*s->rtsp_disp_tbl[id].request)(s, args, out);
+	r = (*s->rtsp_disp_tbl[id].request)(s, s->rtsp, args, out);
 	if(0 > r) {
 		return log_ERR(r);
 	}
diff --git a/src/disp/wfd-session.h b/src/disp/wfd-session.h
index e4b4e3a..ced295e 100644
--- a/src/disp/wfd-session.h
+++ b/src/disp/wfd-session.h
@@ -69,6 +69,7 @@ struct rtsp_dispatch_entry
 {
 	union {
 		int (*request)(struct wfd_session *s,
+						struct rtsp *bus,
 						const struct wfd_arg_list *args,
 						struct rtsp_message **out);
 		int (*handle_request)(struct wfd_session *s,