From 5e44226f2f1f3f566453a5ed74667d8eea31acec Mon Sep 17 00:00:00 2001
From: David Runge <david.runge@frqrec.com>
Date: Wed, 11 Dec 2013 14:48:46 +0100
Subject: Fixed xvfb-run commands for my beaglebone

---
 bin/sclang     | 2 +-
 bin/start_jack | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/sclang b/bin/sclang
index 9cbd92d..a34f4ea 100755
--- a/bin/sclang
+++ b/bin/sclang
@@ -6,5 +6,5 @@ if [[ $HOSTNAME == *dvzrv* ]]; then
   /usr/bin/sclang "$@"
 else
   echo "/usr/bin/sclang in fake X screen"
-  /usr/bin/xvfb-run --server-args="-screen 1, 1280x800x24" /usr/bin/sclang "$@"
+  /usr/bin/xvfb-run -s "-screen 1, 1280x800x24" -a -e ~/.log/xvfb-run-sclang.error /usr/bin/sclang "$@"
 fi
diff --git a/bin/start_jack b/bin/start_jack
index 351d7e3..d3cb508 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -9,7 +9,7 @@ case "$HOSTNAME" in
     alsa_out -d hw:0 -q1 &> .log/alsa_out.log &
     ;;
   "beagleclone")
-    /usr/bin/xvfb-run --server-args="-screen 0, 1280x800x24" jackd -dalsa -dhw:1,0 -p128 -n3 -s &> .log/jackd.log &
+    /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log &
     ;;
   "dvzrv")
     DEVICE="/dev/fw1"
-- 
cgit v1.2.3-70-g09d2


From af269ca4058753868de4390fb8497453a9e7acd0 Mon Sep 17 00:00:00 2001
From: David Runge <david.runge@frqrec.com>
Date: Wed, 11 Dec 2013 15:30:05 +0100
Subject: Updated start_jack/stop_jack for my beaglebone

---
 bin/start_jack | 10 +++++++++-
 bin/stop_jack  |  9 +++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100755 bin/stop_jack

(limited to 'bin')

diff --git a/bin/start_jack b/bin/start_jack
index d3cb508..d28733c 100755
--- a/bin/start_jack
+++ b/bin/start_jack
@@ -9,7 +9,15 @@ case "$HOSTNAME" in
     alsa_out -d hw:0 -q1 &> .log/alsa_out.log &
     ;;
   "beagleclone")
-    /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log &
+    CARDS=$(aplay -l)
+    EXTERNAL="card 1"
+    if [[ "$CARDS" == *$EXTERNAL* ]];then
+      echo "Starting with external USB card"
+      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:1,0 -p128 -n3 -s &> ~/.log/jackd.log &
+    else
+      echo "Starting with internal HDMI card"
+      /usr/bin/xvfb-run -s "-screen 0, 1280x800x24" -a -e ~/.log/xvfb-run-jack.error jackd -dalsa -dhw:0,0 -p128 -n3 -s &> ~/.log/jackd.log &
+    fi
     ;;
   "dvzrv")
     DEVICE="/dev/fw1"
diff --git a/bin/stop_jack b/bin/stop_jack
new file mode 100755
index 0000000..ab49fa9
--- /dev/null
+++ b/bin/stop_jack
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+kill $(pidof jackd)
+#case "$HOSTNAME" in
+#  "beagleclone")
+#    kill $(pidof jackd)
+#    kill $(pidof xvfb-run)
+#  ;;
+#esac
-- 
cgit v1.2.3-70-g09d2