From 08484395f10d4c8b354f2ec09daa388095931cc3 Mon Sep 17 00:00:00 2001
From: David Runge <david.runge@frqrec.com>
Date: Sun, 28 Sep 2014 04:37:27 +0200
Subject: Adding correct echo output to updated script.

---
 bin/start_jack | 36 +++++++++++++++++++++++++++++++++---
 bin/stop_jack  |  7 ++++++-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/bin/start_jack b/bin/start_jack
index 48e97ed..735d5fa 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -1,7 +1,9 @@
 #!/bin/sh
 
+export DISPLAY=:0.0
 #jackd -P70 -p16 -t2000 -dalsa -dhw:0,0 -p128 -n3 -r44100 -s > .log/jackd.log 2>&1 &
 
+echo $HOSTNAME
 case "$HOSTNAME" in
   "pitheunlord")
     jackd -P95 -p32 -ddummy -C1 &> .log/jackd.log &
@@ -22,11 +24,39 @@ case "$HOSTNAME" in
   "dvzrv")
     DEVICE="/dev/fw1"
     if [[ -e $DEVICE && -r $DEVICE && -w $DEVICE ]]; then
-      echo "Setting up Motu Traveler with JACK"
+      echo "Setting up "$DEVICE" with JACK."
+      jack_control start
+      sudo schedtool -R -p 20 `pidof jackdbus`
+      jack_control eps realtime true
+      jack_control ds firewire
+      jack_control dps device $DEVICE
+      jack_control dps rate 48000
+      #jack_control dps rate 44100
+      jack_control dps nperiods 2
+      #jack_control dps period 64
+      jack_control dps period 256
+      sleep 3
+      a2jmidid -e &
+      sudo schedtool -R -p 20 `pidof a2jmidid`
+      rm ~/.config/SuperCollider/startup.scd
+      ln -s ~/.config/SuperCollider/startupfiles/electronicStudio.scd ~/.config/SuperCollider/startup.scd -v
     else
-      echo "Setting up internal JACK server"
+      echo "Setting up ALSA with JACK."
+      jack_control start
+      sudo schedtool -R -p 20 `pidof jackdbus`
+      jack_control eps realtime true
+      jack_control ds alsa
+      jack_control dps device hw:PCH
+      jack_control dps rate 48000
+      jack_control dps nperiods 2
+      jack_control dps period 256
+      sleep 4
+      a2jmidid -e &
+      sudo schedtool -R -p 20 `pidof a2jmidid`
+      rm ~/.config/SuperCollider/startup.scd
+      ln -s ~/.config/SuperCollider/startupfiles/startupSystem.scd ~/.config/SuperCollider/startup.scd -v
+
     fi
-#    jack_control start
     ;;
 esac
 
diff --git a/bin/stop_jack b/bin/stop_jack
index ab49fa9..9c47548 100755
--- a/bin/stop_jack
+++ b/bin/stop_jack
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-kill $(pidof jackd)
+jack_control stop
+sleep 3
+jack_control exit
+exit 0
+
+#kill $(pidof jackd)
 #case "$HOSTNAME" in
 #  "beagleclone")
 #    kill $(pidof jackd)
-- 
cgit v1.2.3-70-g09d2