X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=0ecb7706121ad24e00459ed30daca12a1305e536;hb=c0897f292783f95e30c95784d9e265f29e0279ff;hp=27b3eac4a5e880a323be9aa7a50889b9c60c0797;hpb=f03b6a08d04673082a4163f6360fd94c494e3244;p=utils.git

diff --git a/planime b/planime
index 27b3eac..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,9 @@ while [ "${1:0:1}" = - ]; do
 	    debug=y
 	    ;;
 	-t)
-	    cmdline=("${cmdline[@]}" -ao oss:/dev/dsp1)
+	    cmdline=("${cmdline[@]}" -ao 'alsa:device=[hw:3,7]')
+	    DISPLAY=:1
+	    chwp=y
 	    ;;
 	-C)
 	    pretend=y
@@ -115,6 +117,9 @@ while [ "${1:0:1}" = - ]; do
 	-f)
 	    printfile=y
 	    ;;
+	-v)
+	    cmdline=("${cmdline[@]}" -v)
+	    ;;
 	--)
 	    break
 	    ;;
@@ -239,16 +244,14 @@ 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 [ "`hostname`" = pc6 -o "`hostname`" = pc7 -a "$DISPLAY" = :1 ]; then chwp=y; fi
-
 if [ -n "$pretend" ]; then
     echo "${cmdline[@]}" "$file"
 elif [ -n "$printfile" ]; then