[vlc-commits] commit: Add nsobject support to vout_window_t ( Juho Vähä-Herttua )

[git at videolan.org]

vlc | branch: master | Juho Vähä-Herttua <juhovh at iki.fi> | Wed Jul 21 16:54:21 2010 +0300| [66ddfd87b6d50bbd879b08518df23a009fc163b8] | committer: Rémi Denis-Courmont 

Add nsobject support to vout_window_t

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=66ddfd87b6d50bbd879b08518df23a009fc163b8
---

 include/vlc_vout_window.h |    6 ++++--
 src/video_output/window.c |    6 ++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index 84d78ee..3d7e929 100644
--- 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 a8ef797..d79a4e2 100644
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -64,6 +64,12 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
         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";
         window->handle.xid = 0;