Updated to use mpv instead of mplayer.
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 29 May 2015 20:19:33 +0000 (22:19 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 29 May 2015 20:19:33 +0000 (22:19 +0200)
planime

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