try to fix outstanding licence text issues (#341)

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 <android/log.h>
 #include <QString>
 #include <QEvent>
@@ -9,37 +33,49 @@ const char*const applicationName="Jamulus";
 #include <math.h>
 #include <string>
 
-void myMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg)
+void myMessageHandler ( QtMsgType type, const QMessageLogContext& context, const QString& msg )
 {
-  QString report=msg;
+  QString report = msg;
-  if (context.file && !QString(context.file).isEmpty()) {
+
-    report+=" in file ";
+  if ( context.file && !QString ( context.file ).isEmpty() )
-    report+=QString(context.file);
+  {
-    report+=" line ";
+    report += " in file ";
-    report+=QString::number(context.line);
+    report += QString ( context.file );
+    report += " line ";
+    report += QString::number ( context.line );
   }
-  if (context.function && !QString(context.function).isEmpty()) {
+
-    report+=+" function ";
+  if ( context.function && !QString ( context.function ).isEmpty() )
-    report+=QString(context.function);
+  {
+    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

android/sound.cpp

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Simon Tomlinson
+ *  Simon Tomlinson, Volker Fischer
  *
  ******************************************************************************
  *

android/sound.h

@@ -2,7 +2,7 @@
  * Copyright (c) 2004-2020
  *
  * Author(s):
- *  Simon Tomlinson
+ *  Simon Tomlinson, Volker Fischer
  *
  ******************************************************************************
  *

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
  *
 \******************************************************************************/
 

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
 ---------------------------
 
@@ -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"
 

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
  *
 \******************************************************************************/
 

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
  *
 \******************************************************************************/
 

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
  *
 \******************************************************************************/
 

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:

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