Mercurial > mplayer.hg

changeset 33988:6b9553934e5d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change stop_xscreensaver default to 1 to be more user-friendly.
author reimar
date Wed, 07 Sep 2011 16:15:58 +0000
parents e1a74e3ddee7
children 5b3605aee33b
files DOCS/man/en/mplayer.1 libvo/x11_common.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1	Wed Sep 07 15:46:58 2011 +0000
+++ b/DOCS/man/en/mplayer.1	Wed Sep 07 16:15:58 2011 +0000
@@ -3602,8 +3602,9 @@
 do not know the screen resolution like fbdev, x11 and TV-out.
 .
 .TP
-.B \-stop\-xscreensaver (X11 only)
-Turns off xscreensaver at startup and turns it on again on exit.
+.B \-(no)stop\-xscreensaver (X11 only)
+Turns off xscreensaver at startup and turns it on again on exit
+(default: enabled).
 If your screensaver supports neither the XSS nor XResetScreenSaver
 API please use \-heartbeat\-cmd instead.
 .
--- a/libvo/x11_common.c	Wed Sep 07 15:46:58 2011 +0000
+++ b/libvo/x11_common.c	Wed Sep 07 16:15:58 2011 +0000
@@ -89,7 +89,7 @@
 static int orig_layer = 0;
 static int old_gravity = NorthWestGravity;
 
-int stop_xscreensaver = 0;
+int stop_xscreensaver = 1;
 
 static int dpms_disabled = 0;