X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_vout_window.h;h=3d7e92966bfa7b430578542eaff498b7d839dfa6;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=b3db0818fc61522acb2e02bb28d4b5fe1f517d24;hpb=066325d2f7f8693f171f045e45b50dc70dca988f;p=vlc

diff --git a/include/vlc_vout_window.h b/include/vlc_vout_window.h
index b3db0818fc..3d7e92966b 100644
--- a/include/vlc_vout_window.h
+++ b/include/vlc_vout_window.h
@@ -43,13 +43,14 @@ typedef struct vout_window_sys_t vout_window_sys_t;
 enum {
     VOUT_WINDOW_TYPE_XID,
     VOUT_WINDOW_TYPE_HWND,
+    VOUT_WINDOW_TYPE_NSOBJECT,
 };
 
 /**
  * Control query for vout_window_t
  */
 enum {
-    VOUT_WINDOW_SET_ON_TOP, /* int b_on_top */
+    VOUT_WINDOW_SET_STATE, /* unsigned state */
     VOUT_WINDOW_SET_SIZE,   /* unsigned i_width, unsigned i_height */
     VOUT_WINDOW_SET_FULLSCREEN, /* int b_fullscreen */
 };
@@ -78,9 +79,6 @@ typedef struct {
 struct vout_window_t {
     VLC_COMMON_MEMBERS
 
-    /* Module */
-    module_t *module;
-
     /* Initial state (reserved).
      * Once the open function is called, it will be set to NULL
      */
@@ -91,10 +89,16 @@ 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) */
+    union {
+        char     *x11; /* X11 display (NULL = use default) */
+    } display;
+
     /* Control on the module (mandatory)
      *
      * Do not use it directly; use vout_window_Control instead.
@@ -132,11 +136,11 @@ VLC_EXPORT( void, vout_window_Delete, (vout_window_t *) );
 VLC_EXPORT( int, vout_window_Control, (vout_window_t *, int query, ...) );
 
 /**
- * Configure the "On Top" properties of a windows.
+ * Configure the window management state of a windows.
  */
-static inline int vout_window_SetOnTop(vout_window_t *window, bool is_on_top)
+static inline int vout_window_SetState(vout_window_t *window, unsigned state)
 {
-    return vout_window_Control(window, VOUT_WINDOW_SET_ON_TOP, is_on_top);
+    return vout_window_Control(window, VOUT_WINDOW_SET_STATE, state);
 }
 
 /**