From 66ddfd87b6d50bbd879b08518df23a009fc163b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juho=20V=C3=A4h=C3=A4-Herttua?= Date: Wed, 21 Jul 2010 16:54:21 +0300 Subject: [PATCH] Add nsobject support to vout_window_t MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémi Denis-Courmont --- 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 84d78eebcf..3d7e92966b 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 a8ef797607..d79a4e21eb 100644 --- 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"; -- 2.39.2