diff --git a/.gitignore b/.gitignore index 84cfcf16..14906e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ deploy/ Jamulus.app/ .DS_Store distributions/opus* +distributions/jack2 diff --git a/distributions/raspijamulus.sh b/distributions/raspijamulus.sh index e2fb7696..f8995c6c 100755 --- a/distributions/raspijamulus.sh +++ b/distributions/raspijamulus.sh @@ -1,7 +1,7 @@ #!/bin/bash # This script is intended to setup a clean Raspberry Pi system for running Jamulus -OPUS="opus-1.3" +OPUS="opus-1.1" echo "TODO: sudo apt-get install [needed libraries for compilation and runtime]" @@ -15,11 +15,31 @@ else cd ${OPUS} ./configure --enable-custom-modes --enable-fixed-point make + cd .. +fi + +# Jack audio without DBUS support +if [ -d "jack2" ]; then + echo "The Jack2 directory is present, we assume it is compiled and ready to use. If not, delete the jack2 directory and call this script again." +else + git clone https://github.com/jackaudio/jack2.git + cd jack2 + echo "TODO jack2" + cd .. fi # compile Jamulus with external Opus library cd .. qmake "CONFIG+=opus_shared_lib" Jamulus.pro make -cd distrubutions +cd distributions + +# start Jack2 and Jamulus in headless mode +cd .. +LD_LIBRARY_PATH="distributions/${OPUS}/.libs" +export LD_LIBRARY_PATH +echo "TODO: -dhw:MBox" +#jackd -P70 -p16 -t2000 -d alsa -dhw:MBox -p 128 -n 3 -r 48000 -s & +jackd -P70 -p16 -t2000 -d alsa -dhw:MBox -p 256 -n 3 -r 48000 -s & +./Jamulus -n -c jamulus.fischvolk.de