Rewrite inhibit.c as an "inhibit" interface

Remove libvlc hack, and fixes missing input state changes
ubraz · Dec 3, 2012 · dffdc4c · dffdc4c
1 parent 771335a
commit dffdc4c
Show file tree

Hide file tree

Showing 5 changed files with 193 additions and 314 deletions.
diff --git a/bin/vlc.c b/bin/vlc.c
@@ -246,7 +246,6 @@ int main( int i_argc, const char *ppsz_argv[] )
 #endif
 #ifdef HAVE_DBUS
     libvlc_add_intf (vlc, "dbus,none");
-    libvlc_add_intf (vlc, "inhibit,none");
 #endif
     if (libvlc_add_intf (vlc, NULL))
         goto out;

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
@@ -21,13 +21,6 @@ endif
 EXTRA_LTLIBRARIES += libgnutls_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBgnutls)
 
-libinhibit_plugin_la_SOURCES = inhibit.c
-libinhibit_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libinhibit_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS)
-if HAVE_DBUS
-libvlc_LTLIBRARIES += libinhibit_plugin.la
-endif
-
 libosd_parser_plugin_la_SOURCES = \
 	osd/parser.c osd/osd_menu.c osd/osd_menu.h osd/simple.c osd/xml.c
 libosd_parser_plugin_la_CFLAGS = $(AM_CFLAGS)
@@ -48,6 +41,13 @@ libvlc_LTLIBRARIES += \
 	libxscreensaver_plugin.la
 endif
 
+libpower_plugin_la_SOURCES = inhibit/power.c
+libpower_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
+libpower_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS)
+if HAVE_DBUS
+libvlc_LTLIBRARIES += libpower_plugin.la
+endif
+
 libmce_plugin_la_SOURCES = inhibit/mce.c
 libmce_plugin_la_CFLAGS = $(AM_CLFAGS) $(DBUS_CFLAGS) $(MCE_CFLAGS)
 libmce_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(MCE_LIBS)

diff --git a/modules/misc/inhibit.c b/modules/misc/inhibit.c