X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=planime;h=07bbb916707d67eca31933266d782e47c9e7b592;hb=26c14f89ca84cd6d23718948c1da81280ff12c0a;hp=60549e95a2489e9c9b7cdbbdcd7a94d4fe5f35e5;hpb=5f7e91433d5fea086080b9c7891abad6ed8025b7;p=utils.git

diff --git a/planime b/planime
index 60549e9..07bbb91 100755
--- a/planime
+++ b/planime
@@ -35,7 +35,7 @@ findfile() {
 }
 
 origargs=("$0" "$@")
-cmdline=(mplayer -fs)
+cmdline=(mplayer -fs -ass)
 
 while [ "${1:0:1}" = - ]; do
     a="$1"
@@ -127,10 +127,12 @@ fi
 
 case "${file##*.}" in
     ogm)
-	defopts=(-aid 1 -sid 0)
+	aid=1
+	sid=0
 	;;
     mkv)
-	defopts=(-slang eng -alang jpn)
+	alang=jpn
+	slang=eng
 	;;
 esac
 
@@ -155,15 +157,38 @@ if [ -r "$ifile" ]; then
 	    cmdline=("${cmdline[@]}" -delay "$arg")
 	elif [ "$par" = aspect ]; then
 	    cmdline=("${cmdline[@]}" -aspect "$arg")
+	elif [ "$par" = volmod ]; then
+	    cmdline=("${cmdline[@]}" -af volume="$arg")
+	elif [ "$par" = alang ]; then
+	    unset alang aid
+	    alang="$arg"
+	elif [ "$par" = aid ]; then
+	    unset alang aid
+	    aid="$arg"
+	elif [ "$par" = slang ]; then
+	    unset slang sid
+	    slang="$arg"
+	elif [ "$par" = sid ]; then
+	    unset slang sid
+	    sid="$arg"
 	fi
     done
     exec 0<&3
     exec 3<&-
-else
-    cmdline=("${cmdline[@]}" "${defopts[@]}")
 fi
 
-if [ "`hostname`" = pc6 ]; then chwp=y; fi
+if [ -n "$alang" ]; then
+    cmdline=("${cmdline[@]}" -alang "$alang")
+elif [ -n "$aid" ]; then
+    cmdline=("${cmdline[@]}" -aid "$aid")
+fi
+if [ -n "$slang" ]; then
+    cmdline=("${cmdline[@]}" -slang "$slang")
+elif [ -n "$sid" ]; then
+    cmdline=("${cmdline[@]}" -sid "$sid")
+fi
+
+if [ "`hostname`" = pc6 -o "`hostname`" = pc7 -a "$DISPLAY" = :1 ]; then chwp=y; fi
 
 if [ "$chwp" = y ]; then (sleep 2; randomwp) & fi
 "${cmdline[@]}" "$file"