mpv: replace deprecated options and properties

[config/dotfiles.git] / mplayer / config

diff --git a/mplayer/config b/mplayer/config
index 275c9b7a9d66209f4f8ee36136d415e76f44b84a..f53818674475bbb2c34ec68761b14ed2d5616ee9 100644 (file)
--- a/mplayer/config
+++ b/mplayer/config
@@ -1,19 +1,46 @@
 # MPlayer configuration file.
+#
+# Important notes:
+# - Don't set the cache in here. It applies to all protocols and causes
+#   problems for DVDs (in /dev/dvd and stored on hard disk). Use the -cache
+#   command line option where necessary.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This file is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
-# Use X11 video output.
-vo=x11
-# And ALSA audio output.
+
+# Use xv (preferred, hardware accelerated) or x11 as video driver.
+vo=xv,x11
+# Use ALSA as audio driver.
 ao=alsa
 
-# Automatically zoom to full window size.
+# Fullscreen playback.
+fs=yes
+# Enable software scaling, necessary for video drivers which don't support
+# hardware scaling like x11.
 zoom=yes
 
-# Prefer English and German sound and subtitles.
+# Prefer English and German audio and subtitles.
 alang=en,de
 slang=en,de
 
 # Disable LIRC as I don't use it. Prevents a warning on startup.
 nolirc=yes
 
+# Disable the mouse, no need for it. Prevents accidental skipping with the
+# touchpad (scroll wheel) for example.
+nomouseinput=yes
+
 # vim: ft=mplayerconf