Changeset 5136:afcce15d9d94 in roaraudio

Timestamp:

09/30/11 16:57:27 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

done some improvements, see #174

File:

• plugins/bash/roaraudio (modified) (5 diffs)

plugins/bash/roaraudio

@@ -10 +10 @@
 
 # Tools supported completly:
+#roard
+
+# Tools supported partly:
+
+# Tools not supported at all:
+
+# Tools not supported at all and unimportent:
+
+# Unsupported devel tools:
+
+# The rest:
+#roarcat
+#roarcatplay
+#roarcatvio
+#roarbidir
+#roarmon
+#roarmonhttp
+#roarradio
 #roarctl
-#roard
+#roarlight
+#roarinterconnect
+#roarclientpass
+#roarfilt
 #roarvumeter
-#roarcat
-#roarmon
-#roarinterconnect
-#roarcatplay
-#roarradio
+#roarsockconnect
+#roarphone
+#roarshout
+#roartypes
+#roar-config
 #roarvorbis
-#roarbidir
-#roarphone
-#roarcatvio
-#roarcatpassfh
-#roarcatsendfile
-#roarcatad
-#roarcat2sock
-#roartypes
-#roarsocktypes
-
-# Tools supported partly:
-#roarify
-
-# Tools not supported at all:
-#roarfilt
-#roarfish
-#roarlight
-#roarshout
 #roarsin
-
-# Tools not supported at all and unimportent:
-#roarfctest
-#roarsockconnect
-
-# Unsupported devel tools:
-#roar-config
-
-# The rest:
-#roarmonhttp
+#roardtmf
+#roarvio
 
 _roar_no_opts() {
@@ -59 +54 @@
 
 _roar_server_exec() {
- local cur link words nodes stdsocks x11sock
+ local cur link words nodes stdsocks x11sock file_based file_based_ok
+ local addr
  cur="$1"
  link=$(readlink /etc/roarserver 2> /dev/null)
@@ -65 +61 @@
  nodes=$(grep '^\(node\|executor\)' /etc/decnet.conf 2> /dev/null | sed 's/^.*\tname\t\t*//; s/\t.*$//; s/$/::/')
 
- stdsocks="/tmp/roar $HOME/.roar localhost 0.0";
+ file_based="/tmp/roar $HOME/.roar /tmp/muroard"
+ stdsocks="localhost ::roar";
 
  x11sock=$(xprop -root 2>/dev/null | grep '^ROAR_SERVER(STRING) = ' | sed 's/^[^"]*"//; s/"$//')
 
- words="$link $nodes $stdsocks $x11sock +slp +fork +abstract"
+ file_based_ok=""
+ for addr in $file_based
+ do
+  if [ -S "$addr" ]
+  then
+   file_based_ok="$file_based_ok $addr"
+  fi
+ done
+
+ words="$ROAR_SERVER $link $nodes $file_based_ok $stdsocks $x11sock +slp +fork +abstract"
 
  compgen -A hostname $cur
@@ -576 +582 @@
     opts_output="--odriver --odevice -o -O -oO -oP -oN --list-driver"
     opts_source="--source -s -S -sO -sP -sN --list-sources"
-    opts_mixer="-m --mixer -mO -mN -mP --list-mixers"
+    opts_mixer="-m --mixer -M -mO -mN -mP --list-mixers"
     opts_cf="--list-cf"
     opts_midi="--midi-no-console --midi-console-enable --midi-console --ssynth-enable --ssynth-disable"
@@ -705 +711 @@
             return 0
             ;;
+# Mixer:
+#    opts_mixer="-m --mixer -M -mO -mN -mP --list-mixers"
+        '--mixer'|'-m')
+            words=$(roard --list-mixers | tail -n +3 | sed 's/^ *//; s/ .*$//')
+            COMPREPLY=($(compgen -W "${words}" -- ${cur}))
+            return 0
+            ;;
+        '-M')
+            _filedir
+            return 0
+            ;;
+        '-mO')
+            return 0
+            ;;
+        '-mN')
+            return 0
+            ;;
+        '-mP')
+            return 0
+            ;;
+        '--list-mixers')
+            return 0
+            ;;
 # X11:
         '--x11-display'|'--display')