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

diff --git a/planime b/planime
index a25761e..0ecb770 100755
--- a/planime
+++ b/planime
@@ -14,12 +14,25 @@ scorefile() {
     fi
 }
 
+findbase() {
+    if [ -r aliases ]; then
+	while read alias rest; do
+	    if [ "$alias" = "$1" ]; then
+		echo "$rest"
+		return
+	    fi
+	done <aliases
+    fi
+    echo "$1"
+}
+
 findfile() {
     if [ -n "$debug" ]; then echo "finding base='$1', ep='$2', qual='$3'" >&2; fi
-    local file tail eq eqt m matches max score
+    local base file tail eq eqt m matches max score
     matches=()
-    for file in "$1"*; do
-	tail="${file#"$1"}"
+    base="$(findbase "$1")"
+    for file in "$base"*; do
+	tail="${file#"$base"}"
 	eq="${tail%.*}"
 	m=n
 	if [ "${eq%% *}" -eq "$2" ] 2>/dev/null; then
@@ -37,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
@@ -58,7 +71,7 @@ findfile() {
 }
 
 origargs=("$0" "$@")
-cmdline=(mplayer -fs -ass)
+cmdline=(mpv -fs)
 debug=
 unset pretend printfile
 
@@ -74,13 +87,19 @@ 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
 	    ;;
 	-A)
 	    while :; do
+		if [ $# -lt 1 ]; then
+		    echo "planime: unterminated argument list" >&2
+		    exit 1
+		fi
 		a="$1"
 		shift
 		if [ "$a" = \; ]; then
@@ -98,6 +117,9 @@ while [ "${1:0:1}" = - ]; do
 	-f)
 	    printfile=y
 	    ;;
+	-v)
+	    cmdline=("${cmdline[@]}" -v)
+	    ;;
 	--)
 	    break
 	    ;;
@@ -152,7 +174,7 @@ if [ -z "$file" ]; then
 	    curser=
 	fi
     else
-	curser="$base"
+	curser="$(findbase "$base")"
     fi
     if [ -n "$curser" ]; then
 	file="$(findfile "$dirbase $curser - " "$ep" "$tqual")" || \
@@ -222,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