[vlc-devel] [PATCH 1/6] window: define Wayland surface type
Rémi Denis-Courmont
remi at remlab.net
Wed Aug 27 23:31:27 CEST 2014
---
include/vlc_vout_window.h | 3 +++
src/video_output/window.c | 5 +++++
2 files changed, 8 insertions(+)
diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index ed7d42c..7ce4a2b 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -46,6 +46,7 @@ enum {
VOUT_WINDOW_TYPE_HWND,
VOUT_WINDOW_TYPE_NSOBJECT,
VOUT_WINDOW_TYPE_ANDROID_NATIVE,
+ VOUT_WINDOW_TYPE_WAYLAND,
};
/**
@@ -92,11 +93,13 @@ struct vout_window_t {
uint32_t xid; /* X11 windows ID */
void *nsobject; /* Mac OSX view object */
void *anativewindow; /* Android native window. */
+ void *wl; /* Wayland surface */
} handle;
/* display server (mandatory) */
union {
char *x11; /* X11 display (NULL = use default) */
+ void *wl; /* Wayland struct wl_display pointer */
} display;
/* Control on the module (mandatory)
diff --git a/src/video_output/window.c b/src/video_output/window.c
index bc45bc2..8be5492 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -86,6 +86,11 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
type = "vout window anative";
window->handle.anativewindow = NULL;
break;
+ case VOUT_WINDOW_TYPE_WAYLAND:
+ type = "vout surface wl";
+ window->handle.wl = NULL;
+ window->display.wl = NULL;
+ break;
default:
assert(0);
}
--
2.1.0
More information about the vlc-devel
mailing list