Commit 66ddfd87 authored by Juho Vähä-Herttua's avatar Juho Vähä-Herttua Committed by Rémi Denis-Courmont

Add nsobject support to vout_window_t

Signed-off-by: default avatarRémi Denis-Courmont <remi@remlab.net>
parent a985ebd5
...@@ -43,6 +43,7 @@ typedef struct vout_window_sys_t vout_window_sys_t; ...@@ -43,6 +43,7 @@ typedef struct vout_window_sys_t vout_window_sys_t;
enum { enum {
VOUT_WINDOW_TYPE_XID, VOUT_WINDOW_TYPE_XID,
VOUT_WINDOW_TYPE_HWND, VOUT_WINDOW_TYPE_HWND,
VOUT_WINDOW_TYPE_NSOBJECT,
}; };
/** /**
...@@ -88,8 +89,9 @@ struct vout_window_t { ...@@ -88,8 +89,9 @@ struct vout_window_t {
* It must be filled in the open function. * It must be filled in the open function.
*/ */
union { union {
void *hwnd; /* Win32 window handle */ void *hwnd; /* Win32 window handle */
uint32_t xid; /* X11 windows ID */ uint32_t xid; /* X11 windows ID */
void *nsobject; /* Mac OSX view object */
} handle; } handle;
/* display server (mandatory) */ /* display server (mandatory) */
......
...@@ -63,6 +63,12 @@ vout_window_t *vout_window_New(vlc_object_t *obj, ...@@ -63,6 +63,12 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
type = "vout window hwnd"; type = "vout window hwnd";
window->handle.hwnd = NULL; window->handle.hwnd = NULL;
break; break;
#endif
#ifdef __APPLE__
case VOUT_WINDOW_TYPE_NSOBJECT:
type = "vout window nsobject";
window->handle.nsobject = NULL;
break;
#endif #endif
case VOUT_WINDOW_TYPE_XID: case VOUT_WINDOW_TYPE_XID:
type = "vout window xid"; type = "vout window xid";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment