Changeset 59add6328988b5c6acb83d57817b7b6864730c51

Timestamp:

17/09/05 14:12:54 (3 years ago)

Author:

Clément Stenac <zorglub@videolan.org>

git-committer:

Clément Stenac <zorglub@videolan.org> 1126959174 +0000

git-parent:

[3fba3944f2567fc1e4906271aa716c0b925b69cc]

git-author:

Clément Stenac <zorglub@videolan.org> 1126959174 +0000

Message:

Default to disabling screensaver under X (Closes:#253)
Hide screensaver interface from the prefs

Files:

• modules/misc/screensaver.c (modified) (1 diff)
• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (2 diffs)

modules/misc/screensaver.c

@@ -42 +42 @@
- *****************************************************************************/
-vlc_module_begin();
-    set_category( CAT_INTERFACE );
-    set_subcategory( SUBCAT_INTERFACE_CONTROL );
-    set_description( _("X Screensaver disabler") );
-    set_capability( "interface", 0 );

src/libvlc.c

@@ -749 +749 @@
-
-    /*
-l
+
-     */
-    VLC_AddIntf( 0, "hotkeys,none", VLC_FALSE, VLC_FALSE );
+
+    /*
+     * If needed, load the Xscreensaver interface
+     * Currently, only for X
+     */
+#ifdef HAVE_X11_XLIB_H
+    if( config_GetInt( p_vlc, "disable-screensaver" ) == 1 )
+    {
+        VLC_AddIntf( 0, "screensaver", VLC_FALSE, VLC_FALSE );
+    }
+#endif
-
-    /*

src/libvlc.h

@@ -250 +250 @@
-#define VIDEO_ON_TOP_LONGTEXT N_("Always place the video window on top of " \
-    "other windows." )
+
+#define SS_TEXT N_("Disable screensaver")
+#define SS_LONGTEXT N_("Disable the screensaver during video playback." )
-
-#define VIDEO_DECO_TEXT N_("Window decorations")
@@ -991 +994 @@
-    add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT,
-              VIDEO_ON_TOP_LONGTEXT, VLC_FALSE );
+    add_bool( "disable-screensaver", VLC_TRUE, NULL, SS_TEXT, SS_LONGTEXT,
+              VLC_TRUE );
-
-    set_section( N_("Snapshot") , NULL );