diff --git a/.gitignore b/.gitignore index affbd25d..722b169a 100644 --- 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 index 10e6eac9..8ce0392b 100755 --- 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 index 1f16f905..4f696650 100755 --- 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 index 24d1378e..1397e9fd 100644 --- 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 index fb1b1e6d..fba16499 100644 --- 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 index 6d4186a6..c0df7135 100755 --- 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 index 0745cec2..57fe9bd4 100755 --- 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 index 398093b0..12daeefb 100755 --- 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 index 7cb131ec..ef841dde 100755 --- 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 index f5b2b53c..206b814c 100755 --- 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 index 7952625b..fa286990 100755 --- 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 index a89281f1..738395df 100755 --- a/src/aboutdlgbase.ui +++ b/src/aboutdlgbase.ui @@ -135,7 +135,7 @@ - Copyright (C) 2005-2018 + Copyright (C) 2005-2019 false diff --git a/src/analyzerconsole.cpp b/src/analyzerconsole.cpp index 82a92c66..af751356 100644 --- 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 index 6c088a52..6a8af738 100644 --- 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 index ff6be827..b76cad95 100755 --- 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 index 51fec28b..4c1f5601 100755 --- 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 index 80aa49e6..c2a4125c 100755 --- 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 index 3243278a..f9eeef31 100755 --- 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 index f49ed0e7..91dde08d 100755 --- 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 index 48717220..4adaa973 100755 --- 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 index 90b13e1e..908a3a44 100755 --- 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 index cafbcdfd..eb2b0a07 100755 --- 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 index a82ef116..0b511686 100755 --- 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 index cbe95ef2..045781e3 100755 --- 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 index 4decac1e..47144d81 100755 --- 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 index 2c91925c..28a7b9e7 100755 --- 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 index 720fb1c2..432a6467 100755 --- 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 index 9d1e3734..5e768a3c 100755 --- 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 index b9d791a7..8a4f9a99 100755 --- 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 index 1c952d01..c467575e 100755 --- 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 index 1d2c2beb..b1d8514a 100755 --- 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 index 4b7fc354..07929d09 100755 --- 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 index a5a0bce7..3315854c 100755 --- 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 index dda0bd52..642eeac9 100755 --- 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 index 13112246..fe5beecd 100755 --- 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 index 3e0b34ce..f3f151e8 100755 --- 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 index d9cd1e65..c97a317b 100755 --- 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 index fe7e8a16..a79dcf02 100755 --- 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 index cabc2e3f..ee6ec754 100755 --- 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 index 4ef49a0e..a14cf45c 100755 --- 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 index bd1922e7..495fd2d3 100755 --- 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 index 63901b30..5b621794 100755 --- 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 index 2373921d..d7298d62 100755 --- 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 index 5788f032..ede13dd0 100755 --- 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 index e5d41c44..13afb14e 100755 --- 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 index f26211dc..fc281ae6 100755 --- 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 index 24814572..f5760dee 100755 --- 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 index 645160ed..696723ce 100755 --- 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 index 6d0c818a..3925d409 100755 --- 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 index 886a7ecb..c87f7db5 100755 --- 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 index a8546f88..f8e64665 100755 --- 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 index e8fef81a..83133b66 100755 --- 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 index b72c6cf2..49bf645b 100755 --- 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 index 16e27edb..50160cde 100755 --- a/src/util.cpp +++ b/src/util.cpp @@ -1,5 +1,5 @@ /******************************************************************************\ - * Copyright (c) 2004-2018 + * Copyright (c) 2004-2019 * * Author(s): * Volker Fischer diff --git a/src/util.h b/src/util.h index 6710e3c3..20a8f09e 100755 --- a/src/util.h +++ b/src/util.h @@ -1,5 +1,5 @@ /******************************************************************************\ - * Copyright (c) 2004-2018 + * Copyright (c) 2004-2019 * * Author(s): * Volker Fischer diff --git a/windows/sound.cpp b/windows/sound.cpp index 93eef040..308ba367 100755 --- a/windows/sound.cpp +++ b/windows/sound.cpp @@ -1,5 +1,5 @@ /******************************************************************************\ - * Copyright (c) 2004-2018 + * Copyright (c) 2004-2019 * * Author(s): * Volker Fischer diff --git a/windows/sound.h b/windows/sound.h index 203e5467..ef577fed 100755 --- a/windows/sound.h +++ b/windows/sound.h @@ -1,5 +1,5 @@ /******************************************************************************\ - * Copyright (c) 2004-2018 + * Copyright (c) 2004-2019 * * Author(s): * Volker Fischer