diff --git a/android/androiddebug.cpp b/android/androiddebug.cpp index 93656a47..c2f08d09 100644 --- a/android/androiddebug.cpp +++ b/android/androiddebug.cpp @@ -1,6 +1,30 @@ -const char*const applicationName="Jamulus"; +/******************************************************************************\ + * Copyright (c) 2020 + * + * Author(s): + * Simon Tomlinson + * + ****************************************************************************** + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * +\******************************************************************************/ -#ifdef ANDROIDDEBUG // Set in my myapp.pro file for android builds +const char*const applicationName = "Jamulus"; + +#ifdef ANDROIDDEBUG // Set in my myapp.pro file for android builds #include #include #include @@ -9,37 +33,49 @@ const char*const applicationName="Jamulus"; #include #include -void myMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg) +void myMessageHandler ( QtMsgType type, const QMessageLogContext& context, const QString& msg ) { - QString report=msg; - if (context.file && !QString(context.file).isEmpty()) { - report+=" in file "; - report+=QString(context.file); - report+=" line "; - report+=QString::number(context.line); + QString report = msg; + + if ( context.file && !QString ( context.file ).isEmpty() ) + { + report += " in file "; + report += QString ( context.file ); + report += " line "; + report += QString::number ( context.line ); } - if (context.function && !QString(context.function).isEmpty()) { - report+=+" function "; - report+=QString(context.function); + + if ( context.function && !QString ( context.function ).isEmpty() ) + { + report +=+" function "; + report += QString(context.function); } - const char*const local=report.toLocal8Bit().constData(); - switch (type) { + + const char*const local = report.toLocal8Bit().constData(); + + switch ( type ) + { case QtDebugMsg: - __android_log_write(ANDROID_LOG_DEBUG,applicationName,local); + __android_log_write ( ANDROID_LOG_DEBUG, applicationName, local) ; break; + case QtInfoMsg: - __android_log_write(ANDROID_LOG_INFO,applicationName,local); + __android_log_write ( ANDROID_LOG_INFO, applicationName, local ); break; + case QtWarningMsg: - __android_log_write(ANDROID_LOG_WARN,applicationName,local); + __android_log_write ( ANDROID_LOG_WARN, applicationName, local ); break; + case QtCriticalMsg: - __android_log_write(ANDROID_LOG_ERROR,applicationName,local); + __android_log_write ( ANDROID_LOG_ERROR, applicationName, local ); break; + case QtFatalMsg: default: - __android_log_write(ANDROID_LOG_FATAL,applicationName,local); + __android_log_write ( ANDROID_LOG_FATAL, applicationName, local ); abort(); + break; } } #endif diff --git a/android/sound.cpp b/android/sound.cpp index 2ee06696..5223cfd6 100644 --- a/android/sound.cpp +++ b/android/sound.cpp @@ -2,7 +2,7 @@ * Copyright (c) 2004-2020 * * Author(s): - * Simon Tomlinson + * Simon Tomlinson, Volker Fischer * ****************************************************************************** * diff --git a/android/sound.h b/android/sound.h index d8c27f90..c43c923d 100644 --- a/android/sound.h +++ b/android/sound.h @@ -2,7 +2,7 @@ * Copyright (c) 2004-2020 * * Author(s): - * Simon Tomlinson + * Simon Tomlinson, Volker Fischer * ****************************************************************************** * diff --git a/mac/activity.mm b/mac/activity.mm index e9b56da4..a0f718cc 100644 --- a/mac/activity.mm +++ b/mac/activity.mm @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * \******************************************************************************/ diff --git a/src/protocol.cpp b/src/protocol.cpp index 20d10300..32b4de4f 100755 --- a/src/protocol.cpp +++ b/src/protocol.cpp @@ -4,7 +4,25 @@ * Author(s): * Volker Fischer * + ****************************************************************************** + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + * +\******************************************************************************/ +/* Protocol message definition --------------------------- @@ -145,7 +163,7 @@ MESSAGES (with connection) ... 4 bytes sam rate | 2 bytes audiocod type | ... ... ------------------+-----------------------+ ... ... -----------------+----------------------+ - ... 2 bytes version | 4 bytes audiocod arg | + ... 2 bytes version | 4 bytes audiocod arg | ... -----------------+----------------------+ - "base netw size": length of the base network packet (frame) in bytes @@ -359,25 +377,7 @@ CONNECTION LESS MESSAGES five times for one registration request at 500ms intervals. Beyond this, it should "ping" every 15 minutes (standard re-registration timeout). - - - ****************************************************************************** - * - * This program is free software; you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at your option) any later - * version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - * -\******************************************************************************/ +*/ #include "protocol.h" diff --git a/src/vstmain.cpp b/src/vstmain.cpp index 6766e179..6044c909 100755 --- a/src/vstmain.cpp +++ b/src/vstmain.cpp @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * \******************************************************************************/ diff --git a/src/vstmain.h b/src/vstmain.h index 90e216fa..38edc5e7 100755 --- a/src/vstmain.h +++ b/src/vstmain.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * \******************************************************************************/ diff --git a/src/vstsound.h b/src/vstsound.h index 284449c9..04ea94a6 100755 --- a/src/vstsound.h +++ b/src/vstsound.h @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., - * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * \******************************************************************************/ diff --git a/windows/deploy_windows.bat b/windows/deploy_windows.bat index 16c31562..41979c1b 100755 --- a/windows/deploy_windows.bat +++ b/windows/deploy_windows.bat @@ -1,4 +1,27 @@ @echo off +rem /******************************************************************************\ +rem * Copyright (c) 2004-2020 +rem * +rem * Author(s): +rem * Volker Fischer +rem * +rem ****************************************************************************** +rem * +rem * This program is free software; you can redistribute it and/or modify it under +rem * the terms of the GNU General Public License as published by the Free Software +rem * Foundation; either version 2 of the License, or (at your option) any later +rem * version. +rem * +rem * This program is distributed in the hope that it will be useful, but WITHOUT +rem * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +rem * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +rem * details. +rem * +rem * You should have received a copy of the GNU General Public License along with +rem * this program; if not, write to the Free Software Foundation, Inc., +rem * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +rem * +rem \******************************************************************************/ rem To set up a new Qt and Visual Studio version rem - set environment path variable to the correct Qt bin directories: diff --git a/windows/installer.nsi b/windows/installer.nsi index 326f5bba..7ae68103 100755 --- a/windows/installer.nsi +++ b/windows/installer.nsi @@ -1,3 +1,27 @@ +;/******************************************************************************\ +; * Copyright (c) 2004-2020 +; * +; * Author(s): +; * Volker Fischer +; * +; ****************************************************************************** +; * +; * This program is free software; you can redistribute it and/or modify it under +; * the terms of the GNU General Public License as published by the Free Software +; * Foundation; either version 2 of the License, or (at your option) any later +; * version. +; * +; * This program is distributed in the hope that it will be useful, but WITHOUT +; * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +; * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +; * details. +; * +; * You should have received a copy of the GNU General Public License along with +; * this program; if not, write to the Free Software Foundation, Inc., +; * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +; * +;\******************************************************************************/ + ; Jamulus NSIS installer script !include LogicLib.nsh !include x64.nsh