[vlc-devel] [PATCH 3/6] window: define Wayland EGL window type

Rémi Denis-Courmont remi at remlab.net
Wed Aug 27 23:31:29 CEST 2014


---
 include/vlc_vout_window.h | 3 ++-
 src/video_output/window.c | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 7ce4a2b..36a05c9 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -47,6 +47,7 @@ enum {
     VOUT_WINDOW_TYPE_NSOBJECT,
     VOUT_WINDOW_TYPE_ANDROID_NATIVE,
     VOUT_WINDOW_TYPE_WAYLAND,
+    VOUT_WINDOW_TYPE_WAYLAND_EGL,
 };
 
 /**
@@ -93,7 +94,7 @@ 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 */
+        void     *wl;            /* Wayland surface or EGL window */
     } handle;
 
     /* display server (mandatory) */
diff --git a/src/video_output/window.c b/src/video_output/window.c
index 8be5492..4cb5c69 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -91,6 +91,11 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
         window->handle.wl = NULL;
         window->display.wl = NULL;
         break;
+    case VOUT_WINDOW_TYPE_WAYLAND_EGL:
+        type = "vout window wl egl";
+        window->handle.wl = NULL;
+        window->display.wl = NULL;
+        break;
     default:
         assert(0);
     }
-- 
2.1.0




More information about the vlc-devel mailing list