From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 29 May 2015 20:19:33 +0000 (+0200)
Subject: Updated to use mpv instead of mplayer.
X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=620488cac2bb28479f28d76e7cb1020deccd39a6;p=utils.git

Updated to use mpv instead of mplayer.
---

diff --git a/planime b/planime
index 51646b7..0ecb770 100755
--- a/planime
+++ b/planime
@@ -50,7 +50,7 @@ findfile() {
 	    fi
 	fi
 	if [ "$m" = y ]; then
-	    if [ "$eqt" = "$3" -o "$eqt" = "($3)" ]; then
+	    if [ "$eqt" = "$3" -o "$eqt" = "($3)" -o "${eqt:0:2}" = "- " ]; then
 		matches=("${matches[@]}" "$file")
 	    fi
 	fi
@@ -71,7 +71,7 @@ findfile() {
 }
 
 origargs=("$0" "$@")
-cmdline=(mplayer -fs -ass)
+cmdline=(mpv -fs)
 debug=
 unset pretend printfile
 
@@ -87,7 +87,7 @@ while [ "${1:0:1}" = - ]; do
 	    debug=y
 	    ;;
 	-t)
-	    cmdline=("${cmdline[@]}" -ao alsa:device=hw=3.7)
+	    cmdline=("${cmdline[@]}" -ao 'alsa:device=[hw:3,7]')
 	    DISPLAY=:1
 	    chwp=y
 	    ;;
@@ -117,6 +117,9 @@ while [ "${1:0:1}" = - ]; do
 	-f)
 	    printfile=y
 	    ;;
+	-v)
+	    cmdline=("${cmdline[@]}" -v)
+	    ;;
 	--)
 	    break
 	    ;;
@@ -241,12 +244,12 @@ fi
 if [ -n "$alang" ]; then
     cmdline=("${cmdline[@]}" -alang "$alang")
 elif [ -n "$aid" ]; then
-    cmdline=("${cmdline[@]}" -aid "$aid")
+    cmdline=("${cmdline[@]}" -aid "$((aid + 1))")
 fi
 if [ -n "$slang" ]; then
     cmdline=("${cmdline[@]}" -slang "$slang")
 elif [ -n "$sid" ]; then
-    cmdline=("${cmdline[@]}" -sid "$sid")
+    cmdline=("${cmdline[@]}" -sid "$((sid + 1))")
 fi
 
 if [ -n "$pretend" ]; then