aboutsummaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorDavid Runge <david.runge@frqrec.com>2013-12-12 21:26:58 +0100
committerDavid Runge <david.runge@frqrec.com>2013-12-12 21:26:58 +0100
commit5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91 (patch)
tree3b8ba45924152fbb3f2ff740e6204dc917a93cbd /bin
parent6b8a36cf4275cfffa7c0ca0f355a39e54e44f7c7 (diff)
parentf6c353143bafac583ea040eea7694a05a381fb35 (diff)
downloaddotfiles-5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91.tar.gz
dotfiles-5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91.tar.bz2
dotfiles-5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91.tar.xz
dotfiles-5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91.zip
Merge branch 'master' of https://github.com/davezerave/dot
* 'master' of https://github.com/davezerave/dot: Added /opt/vc/bin and /opt/vc/sbin to PATH for raspberry pi Fixed vim unaliasing for beaglebone and raspberry pi Updated start_jack/stop_jack for my beaglebone Fixed xvfb-run commands for my beaglebone
Diffstat (limited to 'bin')
-rwxr-xr-xbin/sclang2
-rwxr-xr-xbin/start_jack10
-rwxr-xr-xbin/stop_jack9
3 files changed, 19 insertions, 2 deletions
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..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 --server-args="-screen 0, 1280x800x24" 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