From 1d55e643c1c006b74e6288fce5bc8a1710d86cc4 Mon Sep 17 00:00:00 2001
From: Derek Dai <daiderek@gmail.com>
Date: Tue, 21 Mar 2017 18:23:54 +0800
Subject: [PATCH] change argument types of wfd_sink_start_session()

To workaround valac issue
---
 res/miracle-wfdctl-demo    |  2 +-
 src/ctl/ctl.h              | 16 ++++++++--------
 src/disp/wfd-dbus.c        |  6 +++---
 src/disp/wfd-out-session.c |  8 ++++----
 src/disp/wfd-sink.c        |  8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/res/miracle-wfdctl-demo b/res/miracle-wfdctl-demo
index 60b7e5d..b89e31f 100755
--- a/res/miracle-wfdctl-demo
+++ b/res/miracle-wfdctl-demo
@@ -204,7 +204,7 @@ invoke org.freedesktop.miracle.wfd \
     /org/freedesktop/miracle/wfd/sink/$peer_id \
     org.freedesktop.miracle.wfd.Sink \
     Peer /org/freedesktop/miracle/wifi/peer/$peer_id \
-    StartSession ssqqqqs \
+    StartSession ssuuuus \
         "$XAUTHORITY" \
         'x://:0.0' \
         0 \
diff --git a/src/ctl/ctl.h b/src/ctl/ctl.h
index a87900e..06a7202 100644
--- a/src/ctl/ctl.h
+++ b/src/ctl/ctl.h
@@ -174,10 +174,10 @@ int wfd_out_session_new(struct wfd_session **out,
 				struct wfd_sink *sink,
 				const char *authority,
 				const char *display,
-				uint16_t x,
-				uint16_t y,
-				uint16_t width,
-				uint16_t height,
+				uint32_t x,
+				uint32_t y,
+				uint32_t width,
+				uint32_t height,
 				const char *audio_dev);
 int wfd_session_start(struct wfd_session *s, uint64_t id);
 enum wfd_session_dir wfd_session_get_dir(struct wfd_session *s);
@@ -222,10 +222,10 @@ int wfd_sink_start_session(struct wfd_sink *sink,
 				struct wfd_session **out,
 				const char *authority,
 				const char *display,
-				uint16_t x,
-				uint16_t y,
-				uint16_t width,
-				uint16_t height,
+				uint32_t x,
+				uint32_t y,
+				uint32_t width,
+				uint32_t height,
 				const char *audio_dev);
 void wfd_sink_handle_session_ended(struct wfd_sink *sink);
 bool wfd_sink_is_session_started(struct wfd_sink *sink);
diff --git a/src/disp/wfd-dbus.c b/src/disp/wfd-dbus.c
index d7180a1..d834585 100644
--- a/src/disp/wfd-dbus.c
+++ b/src/disp/wfd-dbus.c
@@ -374,12 +374,12 @@ static int wfd_dbus_sink_start_session(sd_bus_message *m,
 	_shl_free_ char *path = NULL;
 	const char *authority;
 	const char *display;
-	uint16_t x, y, width, height;
+	uint32_t x, y, width, height;
 	const char *audio_dev;
 	int r;
 
 	r = sd_bus_message_read(m,
-					"ssqqqqs",
+					"ssuuuus",
 					&authority,
 					&display,
 					&x,
@@ -656,7 +656,7 @@ static const sd_bus_vtable wfd_dbus_vtable[] = {
 
 static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
 	SD_BUS_VTABLE_START(0),
-	SD_BUS_METHOD("StartSession", "ssqqqqs", "o", wfd_dbus_sink_start_session, SD_BUS_VTABLE_UNPRIVILEGED),
+	SD_BUS_METHOD("StartSession", "ssuuuus", "o", wfd_dbus_sink_start_session, SD_BUS_VTABLE_UNPRIVILEGED),
 	/*SD_BUS_PROPERTY("AudioFormats", "a{sv}", wfd_dbus_sink_get_audio_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
 	/*SD_BUS_PROPERTY("VideoFormats", "a{sv}", wfd_dbus_sink_get_video_formats, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
 	/*SD_BUS_PROPERTY("HasAudio", "b", wfd_dbus_sink_has_audio, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/
diff --git a/src/disp/wfd-out-session.c b/src/disp/wfd-out-session.c
index f7b8657..d8eb2f5 100644
--- a/src/disp/wfd-out-session.c
+++ b/src/disp/wfd-out-session.c
@@ -69,10 +69,10 @@ int wfd_out_session_new(struct wfd_session **out,
 				struct wfd_sink *sink,
 				const char *authority,
 				const char *display,
-				uint16_t x,
-				uint16_t y,
-				uint16_t width,
-				uint16_t height,
+				uint32_t x,
+				uint32_t y,
+				uint32_t width,
+				uint32_t height,
 				const char *audio_dev)
 {
 	_shl_free_ char *display_schema = NULL;
diff --git a/src/disp/wfd-sink.c b/src/disp/wfd-sink.c
index 5925d32..4d5a3b5 100644
--- a/src/disp/wfd-sink.c
+++ b/src/disp/wfd-sink.c
@@ -121,10 +121,10 @@ int wfd_sink_start_session(struct wfd_sink *sink,
 				struct wfd_session **out,
 				const char *authority,
 				const char *display,
-				uint16_t x,
-				uint16_t y,
-				uint16_t width,
-				uint16_t height,
+				uint32_t x,
+				uint32_t y,
+				uint32_t width,
+				uint32_t height,
 				const char *audio_dev)
 {
 	int r;