[vlc-commits] inhibit: remove the window ID

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Nov 30 19:05:23 2012 +0200| [273641ace04b6860967d2fd91e398c56bcefbe7d] | committer: Rémi Denis-Courmont

inhibit: remove the window ID

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=273641ace04b6860967d2fd91e398c56bcefbe7d
---

 include/vlc_inhibit.h      |    1 -
 src/video_output/inhibit.c |    3 +--
 src/video_output/inhibit.h |    2 +-
 src/video_output/window.c  |    3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/include/vlc_inhibit.h b/include/vlc_inhibit.h
index 55057a1..5ac460c 100644
--- 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 cefab0a..33d7369 100644
--- 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 7b8f684..2df2c82 100644
--- 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 d47d4f4..7efc8eb 100644
--- 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 */