X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=start.sh;h=f90e336611bc5be3b693ee78f88e3c20c241aa85;hb=804a2a2f884bdda0a90af110635a76391a88f0c0;hp=6adb08bcc97f7a28e378e6d1a21f9c8f6d7b9a29;hpb=811a95d9a6a797149cdfc6a8ad9c6b2a779a87bc;p=audiocontrol.git

diff --git a/start.sh b/start.sh
index 6adb08b..f90e336 100755
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 cd "`dirname "$0"`"
+base="`pwd`"
 
 displaysize="`xdpyinfo | awk '/^  dimensions:/{print $2}'`"
 displaywidth="${displaysize%x*}"
@@ -25,7 +26,7 @@ move() {
 	winid=`xwininfo -name "$name" | awk '/^xwininfo:/{print $4}'`
 	[ -n "$winid" ] || sleep 1
     done
-    ./winmove $winid $x $y $w $h
+    $base/winmove $winid $x $y $w $h
 }
 
 start() {
@@ -57,10 +58,13 @@ killall jack-rack
 killall alsamixer
 killall jackminimix
 killall jackd
+killall audiocontroller
+killall alsaplayer
 
-amixer sset Master 80% on
+amixer sset Master 100% on
 amixer sset PCM 100% on
 amixer sset Capture 50% on
+amixer sset 'Capture Mux' 0,1
 
 start 0 25 496 100 "JACK Audio Connection Kit [(default)] Started." \
     qjackctl
@@ -69,22 +73,27 @@ sooperlooper -l 1 -c 1 -t 300 &
 clients="$clients $!"
 
 cd loops
-start 582 25 794 220 "SooperLooper" \
+start 582 25 794 210 "SooperLooper" \
     slgui
 cd ..
 
-# start 0 153 496 600 "JACK Rack (voice) - voice.rack" \
-start 0 153 496 972 "JACK Rack (voice) - voice.rack" \
+cd conf
+start 0 153 496 428 "JACK Rack (voice) - voice.rack" \
     jack-rack -c 1 -s voice voice.rack
+cd ..
 
-# start 0 781 496 344 "JACK Rack (guitar) - guitar.rack" \
-#    jack-rack -c 1 -s guitar guitar.rack
+start 88 609 408 98 "AlsaPlayer" \
+    alsaplayer -r -l 0
+clients="$clients $!"
+move 0 735 496 390 "Queue"
+alsaplayer --stop
+alsaplayer --volume 1
 
 start 502 25 74 210 "dpm meter" \
     meterbridge -r 0 -t dpm -n meter alsa_pcm:capture_1 jack_rack_voice:out_1
 
 x=`expr $offset + 1382`
-xterm -fn 6x12 -bg black -fg white -cr white -geometry 88x18+${x}+25 +sb -title Mixer \
+xterm -fn 6x12 -bg black -fg white -cr white -geometry 88x17+${x}+25 +sb -title Mixer \
     -e alsamixer -V all &
 clients="$clients $!"
 
@@ -109,7 +118,7 @@ jack_connect minimixer:out_right alsa_pcm:playback_2
 x=`expr $offset + 502`
 xterm -fn '-dejavu-dejavu sans mono-medium-r-normal--*-260-75-75-m-0-iso10646-1' \
     -bg black -fg white -cr white -geometry 88x22+${x}+273 +sb \
-    -title "Audio Controller" # -e /bin/sh -c "while ./audiocontroller; do true; done"
+    -title "Audio Controller" -e /bin/sh -c "while ./audiocontroller; do true; done"
 
 kill $clients 2>/dev/null
 killall jackd 2>/dev/null