diff options
| author | David Runge <david.runge@frqrec.com> | 2013-12-12 21:26:58 +0100 |
|---|---|---|
| committer | David Runge <david.runge@frqrec.com> | 2013-12-12 21:26:58 +0100 |
| commit | 5389aa5b12b16b2c8bf0a40da4a9a19dcba0cf91 (patch) | |
| tree | 3b8ba45924152fbb3f2ff740e6204dc917a93cbd /bin/start_jack | |
| parent | 6b8a36cf4275cfffa7c0ca0f355a39e54e44f7c7 (diff) | |
| parent | f6c353143bafac583ea040eea7694a05a381fb35 (diff) | |
| download | dotfiles-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/start_jack')
| -rwxr-xr-x | bin/start_jack | 10 |
1 files changed, 9 insertions, 1 deletions
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" |