external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

change argument types of wfd_sink_start_session()

Browse source 
To workaround valac issue
This commit is contained in:
Derek Dai 2017-03-21 18:23:54 +08:00
parent b21aa0d039
commit 1d55e643c1
No known key found for this signature in database
GPG key ID: E109CC97553EF009
5 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/miracle-wfdctl-demo
View file

@ -204,7 +204,7 @@ invoke org.freedesktop.miracle.wfd \
/org/freedesktop/miracle/wfd/sink/$peer_id \ /org/freedesktop/miracle/wfd/sink/$peer_id \
org.freedesktop.miracle.wfd.Sink \ org.freedesktop.miracle.wfd.Sink \
Peer /org/freedesktop/miracle/wifi/peer/$peer_id \ Peer /org/freedesktop/miracle/wifi/peer/$peer_id \
StartSession ssqqqqs \ StartSession ssuuuus \
"$XAUTHORITY" \ "$XAUTHORITY" \
'x://:0.0' \ 'x://:0.0' \
0 \ 0 \

16
src/ctl/ctl.h
View file

@ -174,10 +174,10 @@ int wfd_out_session_new(struct wfd_session **out,
struct wfd_sink *sink, struct wfd_sink *sink,
const char *authority, const char *authority,
const char *display, const char *display,
uint16_t x, uint32_t x,
uint16_t y, uint32_t y,
uint16_t width, uint32_t width,
uint16_t height, uint32_t height,
const char *audio_dev); const char *audio_dev);
int wfd_session_start(struct wfd_session *s, uint64_t id); int wfd_session_start(struct wfd_session *s, uint64_t id);
enum wfd_session_dir wfd_session_get_dir(struct wfd_session *s); 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, struct wfd_session **out,
const char *authority, const char *authority,
const char *display, const char *display,
uint16_t x, uint32_t x,
uint16_t y, uint32_t y,
uint16_t width, uint32_t width,
uint16_t height, uint32_t height,
const char *audio_dev); const char *audio_dev);
void wfd_sink_handle_session_ended(struct wfd_sink *sink); void wfd_sink_handle_session_ended(struct wfd_sink *sink);
bool wfd_sink_is_session_started(struct wfd_sink *sink); bool wfd_sink_is_session_started(struct wfd_sink *sink);

6
src/disp/wfd-dbus.c
View file

@ -374,12 +374,12 @@ static int wfd_dbus_sink_start_session(sd_bus_message *m,
_shl_free_ char *path = NULL; _shl_free_ char *path = NULL;
const char *authority; const char *authority;
const char *display; const char *display;
uint16_t x, y, width, height; uint32_t x, y, width, height;
const char *audio_dev; const char *audio_dev;
int r; int r;
r = sd_bus_message_read(m, r = sd_bus_message_read(m,
"ssqqqqs", "ssuuuus",
&authority, &authority,
&display, &display,
&x, &x,
@ -656,7 +656,7 @@ static const sd_bus_vtable wfd_dbus_vtable[] = {
static const sd_bus_vtable wfd_dbus_sink_vtable[] = { static const sd_bus_vtable wfd_dbus_sink_vtable[] = {
SD_BUS_VTABLE_START(0), 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("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("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),*/ /*SD_BUS_PROPERTY("HasAudio", "b", wfd_dbus_sink_has_audio, 0, SD_BUS_VTABLE_PROPERTY_CONST),*/

8
src/disp/wfd-out-session.c
View file

@ -69,10 +69,10 @@ int wfd_out_session_new(struct wfd_session **out,
struct wfd_sink *sink, struct wfd_sink *sink,
const char *authority, const char *authority,
const char *display, const char *display,
uint16_t x, uint32_t x,
uint16_t y, uint32_t y,
uint16_t width, uint32_t width,
uint16_t height, uint32_t height,
const char *audio_dev) const char *audio_dev)
{ {
_shl_free_ char *display_schema = NULL; _shl_free_ char *display_schema = NULL;

8
src/disp/wfd-sink.c
View file

@ -121,10 +121,10 @@ int wfd_sink_start_session(struct wfd_sink *sink,
struct wfd_session **out, struct wfd_session **out,
const char *authority, const char *authority,
const char *display, const char *display,
uint16_t x, uint32_t x,
uint16_t y, uint32_t y,
uint16_t width, uint32_t width,
uint16_t height, uint32_t height,
const char *audio_dev) const char *audio_dev)
{ {
int r; int r;