planime: Changed TV configuration.

[utils.git] / planime

diff --git a/planime b/planime
index a25761e..51646b7 100755 (executable)
--- 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
@@ -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
@@ -152,7 +171,7 @@ if [ -z "$file" ]; then
            curser=
        fi
     else
-       curser="$base"
+       curser="$(findbase "$base")"
     fi
     if [ -n "$curser" ]; then
        file="$(findfile "$dirbase $curser - " "$ep" "$tqual")" || \
@@ -230,8 +249,6 @@ elif [ -n "$sid" ]; then
     cmdline=("${cmdline[@]}" -sid "$sid")
 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