Add nsobject support to vout_window_t

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 84d78eebcf3841ccc5f0b8913d34a303d36ca256..3d7e92966bfa7b430578542eaff498b7d839dfa6 100644 (file)
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -43,6 +43,7 @@ typedef struct vout_window_sys_t vout_window_sys_t;
 enum {
     VOUT_WINDOW_TYPE_XID,
     VOUT_WINDOW_TYPE_HWND,
+    VOUT_WINDOW_TYPE_NSOBJECT,
 };
 
 /**
@@ -88,8 +89,9 @@ struct vout_window_t {
      * It must be filled in the open function.
      */
     union {
-        void     *hwnd;   /* Win32 window handle */
-        uint32_t xid;     /* X11 windows ID */
+        void     *hwnd;     /* Win32 window handle */
+        uint32_t xid;       /* X11 windows ID */
+        void     *nsobject; /* Mac OSX view object */
     } handle;
 
     /* display server (mandatory) */

diff --git a/src/video_output/window.c b/src/video_output/window.c
index a8ef7976076f7d2dcf94f2cf232354dc60e47f7d..d79a4e21eb412869169dfed7e437b9d9e6671e04 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -63,6 +63,12 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
         type = "vout window hwnd";
         window->handle.hwnd = NULL;
         break;
+#endif
+#ifdef __APPLE__
+    case VOUT_WINDOW_TYPE_NSOBJECT:
+        type = "vout window nsobject";
+        window->handle.nsobject = NULL;
+        break;
 #endif
     case VOUT_WINDOW_TYPE_XID:
         type = "vout window xid";