Merge branch 'master' of git://git.videolan.org/vlc

[vlc] / src / video_output / window.c

diff --git a/src/video_output/window.c b/src/video_output/window.c
index 737edbaec779e573b9d3627a0e2324308bbfa6e5..e5f4c25bead61daf2b805fade7f35999150207bf 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -30,14 +30,25 @@
 #include <assert.h>
 
 #include <vlc_common.h>
-#include <vlc_plugin.h>
 #include <vlc_vout_window.h>
+#include <vlc_modules.h>
+#include "inhibit.h"
+#include <libvlc.h>
+
+typedef struct
+{
+    vout_window_t wnd;
+    module_t *module;
+    vlc_inhibit_t *inhibit;
+} window_t;
 
 vout_window_t *vout_window_New(vlc_object_t *obj,
                                const char *module,
                                const vout_window_cfg_t *cfg)
 {
-    vout_window_t *window = vlc_object_create(obj, sizeof(*window));
+    static char const name[] = "window";
+    window_t *w = vlc_custom_create(obj, sizeof(*w), VLC_OBJECT_GENERIC, name);
+    vout_window_t *window = &w->wnd;
 
     window->cfg = cfg;
     memset(&window->handle, 0, sizeof(window->handle));
@@ -48,23 +59,43 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
 
     const char *type;
     switch (cfg->type) {
+#ifdef WIN32
     case VOUT_WINDOW_TYPE_HWND:
         type = "vout window hwnd";
+        window->handle.hwnd = NULL;
         break;
-    default:
-        assert(0);
+#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;
+        window->display.x11 = NULL;
         break;
+    default:
+        assert(0);
     }
 
-    window->module = module_need(window, type,
-                                 module, module && *module != '\0');
-    if (!window->module) {
-        vlc_object_detach(window);
+    w->module = module_need(window, type, module, module && *module != '\0');
+    if (!w->module) {
         vlc_object_release(window);
         return NULL;
     }
+
+    /* Hook for screensaver inhibition */
+    if ( var_InheritBool( obj, "disable-screensaver" ) && cfg->type == VOUT_WINDOW_TYPE_XID) {
+        w->inhibit = vlc_inhibit_Create (VLC_OBJECT (window),
+                                         window->handle.xid);
+        if (w->inhibit != NULL)
+            vlc_inhibit_Set (w->inhibit, true);
+            /* FIXME: ^ wait for vout activation, pause */
+    }
+    else
+        w->inhibit = NULL;
     return window;
 }
 
@@ -73,9 +104,11 @@ void vout_window_Delete(vout_window_t *window)
     if (!window)
         return;
 
-    vlc_object_detach(window);
+    window_t *w = (window_t *)window;
+    if (w->inhibit)
+        vlc_inhibit_Destroy (w->inhibit);
 
-    module_unneed(window, window->module);
+    module_unneed(window, w->module);
 
     vlc_object_release(window);
 }