eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixes for raspijamulus.sh script

Browse source
This commit is contained in:
Volker Fischer 2020-05-03 19:12:46 +02:00
parent e15eaa3d19
commit a7f1b0c7d8
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Jamulus.pro
View file

@ -145,8 +145,14 @@ win32 {
nosoundoption = $$find(CONFIG, "nosound") nosoundoption = $$find(CONFIG, "nosound")
count(nosoundoption, 0) { count(nosoundoption, 0) {
message(Jack Audio Interface Enabled.) message(Jack Audio Interface Enabled.)
contains(CONFIG, "raspijamulus") {
message(Using Jack Audio in raspijamulus.sh mode.)
LIBS += -ljack
} else {
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += jack PKGCONFIG += jack
}
HEADERS += linux/sound.h HEADERS += linux/sound.h
SOURCES += linux/sound.cpp SOURCES += linux/sound.cpp

2
distributions/raspijamulus.sh
View file

@ -75,7 +75,7 @@ fi
# compile Jamulus with external Opus library # compile Jamulus with external Opus library
cd .. cd ..
qmake "CONFIG+=opus_shared_lib" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro qmake "CONFIG+=opus_shared_lib" "CONFIG+=raspijamulus" "INCLUDEPATH+=distributions/${OPUS}/include" "QMAKE_LIBDIR+=distributions/${OPUS}/.libs" "INCLUDEPATH+=distributions/jack2/common" "QMAKE_LIBDIR+=distributions/jack2/build/common" Jamulus.pro
make -j${NCORES} make -j${NCORES}
# get first USB audio sound card device # get first USB audio sound card device