inhibit: remove the window ID

This seemed like a good idea to support xdg-screensaver. But it really
goes in the way.

diff --git a/include/vlc_inhibit.h b/include/vlc_inhibit.h
index 55057a1156ae8e3bdc80e22ffa168c0eab5c26a6..5ac460c2035c3bd92b07d3d6b939f2063422b7bc 100644 (file)
--- a/include/vlc_inhibit.h
+++ b/include/vlc_inhibit.h
@@ -33,7 +33,6 @@ struct vlc_inhibit
 {
     VLC_COMMON_MEMBERS
 
-    uint32_t           window_id;
     vlc_inhibit_sys_t *p_sys;
     void             (*inhibit) (vlc_inhibit_t *, bool);
 };

diff --git a/src/video_output/inhibit.c b/src/video_output/inhibit.c
index cefab0a808d2a42d728cab2836138dbbbc13cffd..33d7369a44808dcd078d369f90373007ccb1356b 100644 (file)
--- a/src/video_output/inhibit.c
+++ b/src/video_output/inhibit.c
@@ -34,14 +34,13 @@ typedef struct
     module_t *module;
 } inhibit_t;
 
-vlc_inhibit_t *vlc_inhibit_Create (vlc_object_t *parent, int_fast32_t wid)
+vlc_inhibit_t *vlc_inhibit_Create (vlc_object_t *parent)
 {
     inhibit_t *priv = vlc_custom_create (parent, sizeof (*priv), "inhibit" );
     if (priv == NULL)
         return NULL;
 
     vlc_inhibit_t *ih = &priv->ih;
-    ih->window_id = wid;
     ih->p_sys = NULL;
     ih->inhibit = NULL;
 

diff --git a/src/video_output/inhibit.h b/src/video_output/inhibit.h
index 7b8f684b7153fc68848e368a3efa776a7f8b0958..2df2c826ea33871c3da7a49aba9763fdd4f12f0b 100644 (file)
--- a/src/video_output/inhibit.h
+++ b/src/video_output/inhibit.h
@@ -23,7 +23,7 @@
 
 # include <vlc_inhibit.h>
 
-vlc_inhibit_t *vlc_inhibit_Create (vlc_object_t *, int_fast32_t);
+vlc_inhibit_t *vlc_inhibit_Create (vlc_object_t *);
 void vlc_inhibit_Destroy (vlc_inhibit_t *);
 
 static inline void vlc_inhibit_Set (vlc_inhibit_t *ih, bool suspend)

diff --git a/src/video_output/window.c b/src/video_output/window.c
index d47d4f438913c08f03c9c77f45b059cbb80c4a8a..7efc8eb796ff0a7c5076ad4fccd5f815a888bc56 100644 (file)
--- a/src/video_output/window.c
+++ b/src/video_output/window.c
@@ -95,8 +95,7 @@ vout_window_t *vout_window_New(vlc_object_t *obj,
     /* 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);
+        w->inhibit = vlc_inhibit_Create(VLC_OBJECT (window));
         if (w->inhibit != NULL)
             vlc_inhibit_Set(w->inhibit, true);
             /* FIXME: ^ wait for vout activation, pause */