Merge pull request #2 from corrados/master

pull master
jamulussoftware · May 15, 2020 · 58b72ca · 58b72ca
2 parents 330e53b + 7c136ae
commit 58b72ca
Show file tree

Hide file tree

Showing 51 changed files with 6,072 additions and 3,005 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/oboe"]
+	path = libs/oboe
+	url = https://github.com/google/oboe.git
diff --git a/ChangeLog b/ChangeLog
@@ -1,33 +1,52 @@
 
+3.5.4git
 
+TODO server list split on query
 
+TODO Keep lrelease? Does it work as expected?
 
+TODO fix Linux deploy script -> gives errors right now
 
-3.5.3git
+TODO WIP support internationalization
 
-- for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4
+TODO implement panning for channels (Ticket #52, #145)
 
-- added bassoon/oboe/harp instrument icons, created by dszgit (Ticket #131)
+TODO show mute state of others
 
-- link to docs from application Help menu (Ticket #90)
 
-- support Mac CoreAudio aggregated devices (Ticket #138)
 
-- added translations: french by trebmuh, portuguese by Snayler (Ticket #77)
 
-- bug fix: for mono capture jack audio interface Jamulus complains it cannot make connections (Ticket #137)
 
 
-TODO re-design About dialog
+3.5.3 (2020-05-15)
 
-TODO implement panning for channels (Ticket #52, #145)
+- correct unregister of headless server and RPP file creation on
+  SIGINT/SIGTERM, coded by pljones (Tickets #130, #168)
 
-TODO WIP support internationalization
+- for CoreAudio and 4 channel input, support mixing channels 1&2 with 3&4
 
-TODO show mute state of others
+- added bassoon/oboe/harp instrument icons created by dszgit,
+  congas/bongo created by bspeer (Ticket #131)
+
+- link to docs from application Help menu (Ticket #90)
+
+- support Mac CoreAudio aggregated devices (Ticket #138)
+
+- added translations: French by trebmuh, Portuguese by Snayler,
+  Spanish by ignotus666, Dutch by jerogee, German by corrados (Ticket #77)
+
+- new design for the About dialog (Ticket #189)
+
+- new command line option -d to disconnect all clients on shutdown of the server (Ticket #161)
+
+- bug fix: for mono capture jack audio interface Jamulus complains it
+  cannot make connections (Ticket #137)
 
+- bug fix: fixed that Jamulus segfaults when jackd is restarted (Ticket #122, #127)
 
+- bug fix: better handling of disconnect message in the client
 
+- note: Jamulus is no longer compatible to Qt4
 
 
 3.5.2 (2020-04-24)

diff --git a/Jamulus.pro b/Jamulus.pro
@@ -1,4 +1,4 @@
-VERSION = 3.5.3git
+VERSION = 3.5.4git
 
 # use target name which does not use a captital letter at the beginning
 contains(CONFIG, "noupcasename") {
@@ -8,7 +8,8 @@ contains(CONFIG, "noupcasename") {
 
 CONFIG += qt \
     thread \
-    release
+    release \
+    lrelease
 
 QT += widgets \
     network \
@@ -17,7 +18,8 @@ QT += widgets \
 TRANSLATIONS = src/res/translation/translation_de_DE.ts \
     src/res/translation/translation_fr_FR.ts \
     src/res/translation/translation_pt_PT.ts \
-    src/res/translation/translation_es_ES.ts
+    src/res/translation/translation_es_ES.ts \
+    src/res/translation/translation_nl_NL.ts
 
 INCLUDEPATH += src
 
@@ -127,14 +129,141 @@ win32 {
         LIBS += /usr/local/lib/libjack.dylib
     }
 } else:android {
+    # we want to compile with C++14
+    CONFIG += c++14
+
+    QT += androidextras
+
+    # enabled only for debugging on android devices
+    DEFINES += ANDROIDDEBUG
+
+    target.path = /tmp/your_executable # path on device
+    INSTALLS += target
+
     HEADERS += android/sound.h
-    SOURCES += android/sound.cpp
+    SOURCES += android/sound.cpp \
+        android/androiddebug.cpp
+
     LIBS += -lOpenSLES
     ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
     OTHER_FILES += android/AndroidManifest.xml
+
+# if compiling for android you need to use Oboe library which is included as a git submodule
+# make sure you git pull with submodules to pull the latest Oboe library
+OBOE_SOURCES = libs/oboe/src/aaudio/AAudioLoader.cpp \
+    libs/oboe/src/aaudio/AudioStreamAAudio.cpp \
+    libs/oboe/src/common/AudioSourceCaller.cpp \
+    libs/oboe/src/common/AudioStream.cpp \
+    libs/oboe/src/common/AudioStreamBuilder.cpp \
+    libs/oboe/src/common/DataConversionFlowGraph.cpp \
+    libs/oboe/src/common/FilterAudioStream.cpp \
+    libs/oboe/src/common/FixedBlockAdapter.cpp \
+    libs/oboe/src/common/FixedBlockReader.cpp \
+    libs/oboe/src/common/FixedBlockWriter.cpp \
+    libs/oboe/src/common/LatencyTuner.cpp \
+    libs/oboe/src/common/QuirksManager.cpp \
+    libs/oboe/src/common/SourceFloatCaller.cpp \
+    libs/oboe/src/common/SourceI16Caller.cpp \
+    libs/oboe/src/common/StabilizedCallback.cpp \
+    libs/oboe/src/common/Trace.cpp \
+    libs/oboe/src/common/Utilities.cpp \
+    libs/oboe/src/common/Version.cpp \
+    libs/oboe/src/fifo/FifoBuffer.cpp \
+    libs/oboe/src/fifo/FifoController.cpp \
+    libs/oboe/src/fifo/FifoControllerBase.cpp \
+    libs/oboe/src/fifo/FifoControllerIndirect.cpp \
+    libs/oboe/src/flowgraph/ClipToRange.cpp \
+    libs/oboe/src/flowgraph/FlowGraphNode.cpp \
+    libs/oboe/src/flowgraph/ManyToMultiConverter.cpp \
+    libs/oboe/src/flowgraph/MonoToMultiConverter.cpp \
+    libs/oboe/src/flowgraph/RampLinear.cpp \
+    libs/oboe/src/flowgraph/SampleRateConverter.cpp \
+    libs/oboe/src/flowgraph/SinkFloat.cpp \
+    libs/oboe/src/flowgraph/SinkI16.cpp \
+    libs/oboe/src/flowgraph/SinkI24.cpp \
+    libs/oboe/src/flowgraph/SourceFloat.cpp \
+    libs/oboe/src/flowgraph/SourceI16.cpp \
+    libs/oboe/src/flowgraph/SourceI24.cpp \
+    libs/oboe/src/flowgraph/resampler/IntegerRatio.cpp \
+    libs/oboe/src/flowgraph/resampler/LinearResampler.cpp \
+    libs/oboe/src/flowgraph/resampler/MultiChannelResampler.cpp \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResampler.cpp \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.cpp \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.cpp \
+    libs/oboe/src/flowgraph/resampler/SincResampler.cpp \
+    libs/oboe/src/flowgraph/resampler/SincResamplerStereo.cpp \
+    libs/oboe/src/opensles/AudioInputStreamOpenSLES.cpp \
+    libs/oboe/src/opensles/AudioOutputStreamOpenSLES.cpp \
+    libs/oboe/src/opensles/AudioStreamBuffered.cpp \
+    libs/oboe/src/opensles/AudioStreamOpenSLES.cpp \
+    libs/oboe/src/opensles/EngineOpenSLES.cpp \
+    libs/oboe/src/opensles/OpenSLESUtilities.cpp \
+    libs/oboe/src/opensles/OutputMixerOpenSLES.cpp
+
+OBOE_HEADERS = libs/oboe/src/aaudio/AAudioLoader.h \
+    libs/oboe/src/aaudio/AudioStreamAAudio.h \
+    libs/oboe/src/common/AudioClock.h \
+    libs/oboe/src/common/AudioSourceCaller.h \
+    libs/oboe/src/common/DataConversionFlowGraph.h \
+    libs/oboe/src/common/FilterAudioStream.h \
+    libs/oboe/src/common/FixedBlockAdapter.h \
+    libs/oboe/src/common/FixedBlockReader.h \
+    libs/oboe/src/common/FixedBlockWriter.h \
+    libs/oboe/src/common/MonotonicCounter.h \
+    libs/oboe/src/common/OboeDebug.h \
+    libs/oboe/src/common/QuirksManager.h \
+    libs/oboe/src/common/SourceFloatCaller.h \
+    libs/oboe/src/common/SourceI16Caller.h \
+    libs/oboe/src/common/Trace.h \
+    libs/oboe/src/fifo/FifoBuffer.h \
+    libs/oboe/src/fifo/FifoController.h \
+    libs/oboe/src/fifo/FifoControllerBase.h \
+    libs/oboe/src/fifo/FifoControllerIndirect.h \
+    libs/oboe/src/flowgraph/ClipToRange.h \
+    libs/oboe/src/flowgraph/FlowGraphNode.h \
+    libs/oboe/src/flowgraph/ManyToMultiConverter.h \
+    libs/oboe/src/flowgraph/MonoToMultiConverter.h \
+    libs/oboe/src/flowgraph/RampLinear.h \
+    libs/oboe/src/flowgraph/SampleRateConverter.h \
+    libs/oboe/src/flowgraph/SinkFloat.h \
+    libs/oboe/src/flowgraph/SinkI16.h \
+    libs/oboe/src/flowgraph/SinkI24.h \
+    libs/oboe/src/flowgraph/SourceFloat.h \
+    libs/oboe/src/flowgraph/SourceI16.h \
+    libs/oboe/src/flowgraph/SourceI24.h \
+    libs/oboe/src/flowgraph/resampler/HyperbolicCosineWindow.h \
+    libs/oboe/src/flowgraph/resampler/IntegerRatio.h \
+    libs/oboe/src/flowgraph/resampler/LinearResampler.h \
+    libs/oboe/src/flowgraph/resampler/MultiChannelResampler.h \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResampler.h \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResamplerMono.h \
+    libs/oboe/src/flowgraph/resampler/PolyphaseResamplerStereo.h \
+    libs/oboe/src/flowgraph/resampler/SincResampler.h \
+    libs/oboe/src/flowgraph/resampler/SincResamplerStereo.h \
+    libs/oboe/src/opensles/AudioInputStreamOpenSLES.h \
+    libs/oboe/src/opensles/AudioOutputStreamOpenSLES.h \
+    libs/oboe/src/opensles/AudioStreamBuffered.h \
+    libs/oboe/src/opensles/AudioStreamOpenSLES.h \
+    libs/oboe/src/opensles/EngineOpenSLES.h \
+    libs/oboe/src/opensles/OpenSLESUtilities.h \
+    libs/oboe/src/opensles/OutputMixerOpenSLES.h
+
+INCLUDEPATH_OBOE = libs/oboe/include/ \
+    libs/oboe/src/
+
+DISTFILES_OBOE += libs/oboe/AUTHORS \
+    libs/oboe/CONTRIBUTING \
+    libs/oboe/LICENSE \
+    libs/oboe/README
+
+    INCLUDEPATH += $$INCLUDEPATH_OBOE
+    HEADERS += $$OBOE_HEADERS
+    SOURCES += $$OBOE_SOURCES
+    DISTFILES += $$DISTFILES_OBOE
+
 } else:unix {
     # we want to compile with C++11
-    QMAKE_CXXFLAGS += -std=c++11
+    CONFIG += c++11
 
     # we assume to have lrintf() one moderately modern linux distributions
     # would be better to have that tested, though
@@ -209,7 +338,8 @@ HEADERS += src/audiomixerboard.h \
     src/recorder/jamrecorder.h \
     src/recorder/creaperproject.h \
     src/recorder/cwavestream.h \
-    src/historygraph.h
+    src/historygraph.h \
+    src/signalhandler.h
 
 HEADERS_OPUS = libs/opus/celt/arch.h \
     libs/opus/celt/bands.h \
@@ -323,6 +453,7 @@ SOURCES += src/audiomixerboard.cpp \
     src/serverlist.cpp \
     src/serverlogging.cpp \
     src/settings.cpp \
+    src/signalhandler.cpp \
     src/socket.cpp \
     src/soundbase.cpp \
     src/util.cpp \
@@ -491,6 +622,12 @@ DISTFILES += ChangeLog \
     COPYING \
     INSTALL.md \
     README.md \
+    android/build.gradle \
+    android/gradle/wrapper/gradle-wrapper.jar \
+    android/gradle/wrapper/gradle-wrapper.properties \
+    android/gradlew \
+    android/gradlew.bat \
+    android/res/values/libs.xml \
     src/res/CLEDBlack.png \
     src/res/CLEDBlackSmall.png \
     src/res/CLEDDisabledSmall.png \
@@ -578,6 +715,10 @@ DISTFILES += ChangeLog \
     src/res/instruments/harp.svg \
     src/res/instruments/harp.png \
     src/res/instruments/viola.png \
+    src/res/instruments/congas.svg \
+    src/res/instruments/congas.png \
+    src/res/instruments/bongo.svg \
+    src/res/instruments/bongo.png \
     src/res/flags/flagnone.png \
     src/res/flags/ad.png \
     src/res/flags/ae.png \