Merge branch 'master' into feature/pljones-audio-stream-saving

2019-04-03 18:14:49 +01:00 · 2019-04-03 18:14:49 +01:00 · 005a506b0d
commit 005a506b0d
parent 8c1deffda7 46d1d26d4f
57 changed files with 66 additions and 54 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,3 +15,10 @@ ui_*.h
 moc_predefs.h
 src/res/qrc_resources.cpp
 windows/ASIOSDK2
+debug/
+jamulus.vcxproj
+jamulus.vcxproj.filters
+release/
+deploy/
+Jamulus.app/
+.DS_Store
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *	Volker Fischer
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *	Volker Fischer
--- a/android/sound.cpp
+++ b/android/sound.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/android/sound.h
+++ b/android/sound.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/linux/deploy_linux.sh
+++ b/linux/deploy_linux.sh
@ -6,5 +6,6 @@ qmake Jamulus.pro
 make -j2
 make dist

+mkdir -p deploy
 mv *.tar.gz deploy/Jamulus-version.tar.gz
 cd linux
--- a/linux/sound.cpp
+++ b/linux/sound.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/linux/sound.h
+++ b/linux/sound.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/mac/deploy_mac.sh
+++ b/mac/deploy_mac.sh
@ -6,6 +6,9 @@ cd ..
 # cvs -n update 2>null | grep -i "M " # error if any file is locally modified!!! -> TODO


+# call qmake
+qmake Jamulus.pro
+
 # first clean up
 rm -rf Jamulus.app
 make clean
@ -20,6 +23,7 @@ macdeployqt Jamulus.app -dmg
 zip Jamulus-version-mac.zip Jamulus.dmg COPYING

 # move new file in deploy directory
+mkdir -p deploy
 mv Jamulus-version-mac.zip deploy/Jamulus-version-mac.zip

 # cleanup and go back to original directory
--- a/mac/sound.cpp
+++ b/mac/sound.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/mac/sound.h
+++ b/mac/sound.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/aboutdlgbase.ui
+++ b/src/aboutdlgbase.ui
@ -135,7 +135,7 @@
           <item>
            <widget class="QLabel" name="lblCopyright">
             <property name="text">
-              <string>Copyright (C) 2005-2018</string>
+              <string>Copyright (C) 2005-2019</string>
             </property>
             <property name="wordWrap">
              <bool>false</bool>
--- a/src/analyzerconsole.cpp
+++ b/src/analyzerconsole.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer 
--- a/src/analyzerconsole.h
+++ b/src/analyzerconsole.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/audiomixerboard.cpp
+++ b/src/audiomixerboard.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer 
--- a/src/audiomixerboard.h
+++ b/src/audiomixerboard.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/buffer.cpp
+++ b/src/buffer.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/buffer.h
+++ b/src/buffer.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/channel.cpp
+++ b/src/channel.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/channel.h
+++ b/src/channel.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/chatdlg.cpp
+++ b/src/chatdlg.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/chatdlg.h
+++ b/src/chatdlg.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/client.cpp
+++ b/src/client.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/client.h
+++ b/src/client.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/clientdlg.cpp
+++ b/src/clientdlg.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/clientdlg.h
+++ b/src/clientdlg.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/clientsettingsdlg.cpp
+++ b/src/clientsettingsdlg.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/clientsettingsdlg.h
+++ b/src/clientsettingsdlg.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/connectdlg.cpp
+++ b/src/connectdlg.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/connectdlg.h
+++ b/src/connectdlg.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/global.h
+++ b/src/global.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * \Copyright (c) 2004-2018
+ * \Copyright (c) 2004-2019
 * \author    Volker Fischer
 *

--- a/src/main.cpp
+++ b/src/main.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/multicolorled.cpp
+++ b/src/multicolorled.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/multicolorled.h
+++ b/src/multicolorled.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/multicolorledbar.cpp
+++ b/src/multicolorledbar.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/multicolorledbar.h
+++ b/src/multicolorledbar.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/protocol.h
+++ b/src/protocol.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/server.cpp
+++ b/src/server.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/server.h
+++ b/src/server.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverlist.cpp
+++ b/src/serverlist.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverlist.h
+++ b/src/serverlist.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverlogging.cpp
+++ b/src/serverlogging.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/serverlogging.h
+++ b/src/serverlogging.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/settings.cpp
+++ b/src/settings.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/settings.h
+++ b/src/settings.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/socket.cpp
+++ b/src/socket.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/socket.h
+++ b/src/socket.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/soundbase.cpp
+++ b/src/soundbase.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/soundbase.h
+++ b/src/soundbase.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/testbench.h
+++ b/src/testbench.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/util.cpp
+++ b/src/util.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/src/util.h
+++ b/src/util.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/windows/sound.cpp
+++ b/windows/sound.cpp
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer
--- a/windows/sound.h
+++ b/windows/sound.h
@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
 *
 * Author(s):
 *  Volker Fischer