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

jamulussoftware · Apr 3, 2019 · 005a506 · 005a506
2 parents 8c1deff + 46d1d26
commit 005a506
Show file tree

Hide file tree

Showing 57 changed files with 66 additions and 54 deletions.
diff --git 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
diff --git a/INSTALL b/INSTALL
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *	Volker Fischer

diff --git a/README b/README
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *	Volker Fischer

diff --git a/android/sound.cpp b/android/sound.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/android/sound.h b/android/sound.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git 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
diff --git a/linux/sound.cpp b/linux/sound.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/linux/sound.h b/linux/sound.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git 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

diff --git a/mac/sound.cpp b/mac/sound.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/mac/sound.h b/mac/sound.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git 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>

diff --git a/src/analyzerconsole.cpp b/src/analyzerconsole.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer 

diff --git a/src/analyzerconsole.h b/src/analyzerconsole.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/audiomixerboard.cpp b/src/audiomixerboard.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer 

diff --git a/src/audiomixerboard.h b/src/audiomixerboard.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/buffer.cpp b/src/buffer.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/buffer.h b/src/buffer.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/channel.cpp b/src/channel.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/channel.h b/src/channel.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/chatdlg.cpp b/src/chatdlg.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/chatdlg.h b/src/chatdlg.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/client.cpp b/src/client.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/client.h b/src/client.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/clientdlg.h b/src/clientdlg.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/connectdlg.cpp b/src/connectdlg.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/connectdlg.h b/src/connectdlg.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/global.h b/src/global.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * \Copyright (c) 2004-2018
+ * \Copyright (c) 2004-2019
  * \author    Volker Fischer
  *
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/multicolorled.h b/src/multicolorled.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/multicolorledbar.cpp b/src/multicolorledbar.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/multicolorledbar.h b/src/multicolorledbar.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/protocol.h b/src/protocol.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/server.cpp b/src/server.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/server.h b/src/server.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverdlg.h b/src/serverdlg.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverlist.cpp b/src/serverlist.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverlist.h b/src/serverlist.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverlogging.cpp b/src/serverlogging.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/serverlogging.h b/src/serverlogging.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/settings.h b/src/settings.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/socket.cpp b/src/socket.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/socket.h b/src/socket.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/soundbase.cpp b/src/soundbase.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/soundbase.h b/src/soundbase.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/testbench.h b/src/testbench.h
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer

diff --git a/src/util.cpp b/src/util.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2018
+ * Copyright (c) 2004-2019
  *
  * Author(s):
  *  Volker Fischer