From 9c17061f28ad38237832d373dc9bfad6227d297e Mon Sep 17 00:00:00 2001 From: gabucino Date: Tue, 18 Sep 2001 17:04:25 +0000 Subject: minor additions/fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1918 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/mplayer.1 | 4 ++-- etc/example.conf | 26 +++++++++++++++++--------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 18f82bbe09..42c7a9f178 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -13,7 +13,7 @@ mplayer \- Movie Player for Linux .RB [ \-vcd\ track\ number ] .RB [ \-sb\ byte\ position ] .RB [ \-nosound ] -.RB [ \-abs\ seconds ] +.RB [ \-abs\ bytes ] .RB [ \-delay\ secs ] .RB [ \-bps ] .RB [ \-aid\ id ] @@ -267,7 +267,7 @@ seek to byte position seek to second position .TP .B \-abs\ bytes -audio buffer size (in bytes, default: measuring) +sound card audio buffer size (in bytes, default: measuring) .TP .B \-delay\ secs audio delay in seconds (may be +/- float value) diff --git a/etc/example.conf b/etc/example.conf index 911ff3d319..28665b5c1e 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -27,15 +27,15 @@ fs=yes # Enlarges movie window to your desktop's size. # 2 = old method (0.17a) # 3 = ICCCWM patch + Motif method -#vm=no # Tries to change to a different videomode +# vm=no # Tries to change to a different videomode # Used by drivers: dga2, x11, sdl -#bpp=0 # Force changing display depth. +# bpp=0 # Force changing display depth. # Valid settings are: 0, 15, 16, 24, 32 # may need 'vm=yes' too. # Used by drivers: fbdev, dga2, svga -#zoom=no # Enable software scaling (powerful CPU needed) +# zoom=no # Enable software scaling (powerful CPU needed) # Used by drivers: svga, aalib # double=yes # use double-buffering (recommended for xv with @@ -44,6 +44,12 @@ fs=yes # Enlarges movie window to your desktop's size. # x=800 # scale movie to pixels width # y=600 # scale movie to pixels height +## +## Use GUI mode by default +## + +# gui = yes + ## ## Specify your preferred default skin here ## (skins are searched in /usr/local/share/mplayer/Skin/yourskin @@ -64,10 +70,10 @@ fs=yes # Enlarges movie window to your desktop's size. ## You can also use spaces and/or tabs. ## -#sound = 1 -#nosound = nein -#mixer = /dev/mixer -#master = no # no : set PCM volume yes : set MASTER volume +# sound = 1 +# nosound = nein +# mixer = /dev/mixer +# master = no # no : set PCM volume yes : set MASTER volume ## ## resample the fonts' alphamap @@ -77,7 +83,7 @@ fs=yes # Enlarges movie window to your desktop's size. ## 10 bold black outline ## -#ffactor = 0.75 +# ffactor = 0.75 ## ## FBdev driver: specify your monitor's timings, so resolutions @@ -129,5 +135,7 @@ framedrop = yes # drop frames, when not in sync (slow CPU, videocard, ## You can also include other configfiles ## Specify full path! ## +## Delete this default :) +## -include = /home/gabucino/.mplayer/savage4.conf # comment-me-out! :) +include = /home/gabucino/.mplayer/i_did_not_RTFM_carefully_enough... -- cgit v1.2.3