mplayer2: Add configuration files.

Also update setup.sh to either install mplayer or mplayer2 configuration
files.

diff --git a/mplayer2/config b/mplayer2/config
new file mode 100644 (file)
index 0000000..3459e3b
--- /dev/null
+++ b/mplayer2/config
@@ -0,0 +1,38 @@
+# MPlayer2 (mplayer fork) configuration file.
+
+# Copyright (C) 2011-2013  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 xv (preferred, hardware accelerated) or x11 as video driver.
+vo=xv,x11
+# Use ALSA as audio driver.
+ao=alsa
+
+# Use PCM to control volume. mplayer2 uses Master by default.
+mixer-channel=PCM
+
+# 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

diff --git a/mplayer2/input.conf b/mplayer2/input.conf
new file mode 120000 (symlink)
index 0000000..f7c802a
--- /dev/null
+++ b/mplayer2/input.conf
@@ -0,0 +1 @@
+../mplayer/input.conf
\ No newline at end of file

diff --git a/setup.sh b/setup.sh
index 27af2451e542c27a3b7aad1031bdf329c10b33ac..01217a1edc6c524d6c6284c1db00ed9dcaf4d6cb 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -22,5 +22,12 @@ set -e
 
 . ../lib.sh
 
-# Link setup.
-link mplayer ~/.mplayer
+
+# MPlayer and MPlayer2 use the same configuration directory.
+if installed mplayer; then
+    if mplayer --help | grep MPlayer2 >/dev/null; then
+        link mplayer2 ~/.mplayer
+    else
+        link mplayer ~/.mplayer
+    fi
+fi