Merge branch 'master' of https://github.com/davezerave/dot

* 'master' of https://github.com/davezerave/dot:
  Added more journalctl aliases.
  Adding alias for journalctl to see messages from this boot only.
  Adding further ignores for home directory
  Adding Arduino related vundles
  Adding Arduino preferences
  Adding locally compiled tmux-mem-cpu-load version
  Adding scripts to check weather currently running a realtime or vanilla kernel.
  Adding correct echo output to updated script.
  Changing output messages from Dropbox to ownCloud.
  Adding further aliases, cleaning up systemd aliases and others.
  Disabling the start of syndaemon, as a systemd user service is taking care of this now (hopefully)
  Updated user-dirs.dirs settings file to reflect further changes in user home structure.
  Raising the settings for night mode.
  Splitting settings for external server into separate config file.
  Adding newer Ardour version to settings.
  Deleting unneeded arduino preferences file
  Shifting to new key bindings config file 'bindings', deleting old ('keys'), updating config file to new settings format.

1 files changed, 33 insertions, 3 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