Changeset 1995f882d45bf8f9bd167f9ba549ca7d1efb664e

Timestamp:

10/21/07 01:47:34 (10 months ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1192924054 +0000

git-parent:

[794eece829a9840339be996a8cd44a9153916877]

git-author:

Rafaël Carré <funman@videolan.org> 1192924054 +0000

Message:

New inhibit module to prevent the power management daemon (usually gnome-power-manager) to suspend/hibernate the laptop while VLC is active.

Files:

• configure.ac (modified) (1 diff)
• modules/misc/Modules.am (modified) (1 diff)
• modules/misc/inhibit.c (added)
• src/libvlc-common.c (modified) (1 diff)
• src/libvlc-module.c (modified) (2 diffs)

configure.ac

@@ -900 +900 @@
-          VLC_ADD_LIBS([telepathy],[$DBUS_LIBS])
-          VLC_ADD_CFLAGS([telepathy],[$DBUS_CFLAGS])
-
-
+
+
+
+
+
+
-    if ${PKG_CONFIG} --exists dbus-1
-    then

modules/misc/Modules.am

@@ -14 +14 @@
-SOURCES_profile_parser = profile_parser.c
-SOURCES_audioscrobbler = audioscrobbler.c
+SOURCES_inhibit = inhibit.c

src/libvlc-common.c

@@ -855 +855 @@
-    if( config_GetInt( p_libvlc, "one-instance" ) )
-        VLC_AddIntf( 0, "dbus,none", VLC_FALSE, VLC_FALSE );
+
+    /* Prevents the power management daemon to suspend the computer
+     * when VLC is active */
+    if( config_GetInt( p_libvlc, "inhibit" ) )
+        VLC_AddIntf( 0, "inhibit,none", VLC_FALSE, VLC_FALSE );
-#endif
-

src/libvlc-module.c

@@ -403 +403 @@
-#define SS_TEXT N_("Disable screensaver")
-#define SS_LONGTEXT N_("Disable the screensaver during video playback." )
+
+#define INHIBIT_TEXT N_("Inhibits the power management daemon during playback.")
+#define INHIBIT_LONGTEXT N_("Inhibits the power management daemon during any" \
+    "playback, to avoid the computer being suspended because of inactivity.")
-
-#define VIDEO_DECO_TEXT N_("Window decorations")
@@ -1788 +1792 @@
-              PLAYLISTENQUEUE_LONGTEXT, VLC_TRUE );
-        change_unsaveable();
+
+    add_bool( "inhibit", 1, NULL, INHIBIT_TEXT,
+              INHIBIT_LONGTEXT, VLC_TRUE );
-#endif
-