change all 2014 to 2015

ChangeLog

@@ -1,7 +1,6 @@
 3.3.7
 
 
-TODO change all 2014 to 2015
 TODO add a second licence alternative
 
 

android/sound.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

android/sound.h

@@ -1,83 +1,83 @@
-/******************************************************************************\
+/******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
- *
+ *
- * Author(s):
+ * Author(s):
- *  Volker Fischer
+ *  Volker Fischer
- *
+ *
- ******************************************************************************
+ ******************************************************************************
- *
+ *
- * This program is free software; you can redistribute it and/or modify it under
+ * 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
+ * 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
+ * Foundation; either version 2 of the License, or (at your option) any later
- * version.
+ * version.
- *
+ *
- * This program is distributed in the hope that it will be useful, but WITHOUT
+ * 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
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
+ * details.
- *
+ *
- * You should have received a copy of the GNU General Public License along with
+ * 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.,
+ * this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ *
-\******************************************************************************/
+\******************************************************************************/
-
+
-#if !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)
+#if !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)
-#define _SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_
+#define _SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_
-
+
-#include <SLES/OpenSLES.h>
+#include <SLES/OpenSLES.h>
-#include <SLES/OpenSLES_Android.h>
+#include <SLES/OpenSLES_Android.h>
-#include <QMutex>
+#include <QMutex>
-#include "soundbase.h"
+#include "soundbase.h"
-#include "global.h"
+#include "global.h"
-
+
-
+
-/* Classes ********************************************************************/
+/* Classes ********************************************************************/
-class CSound : public CSoundBase
+class CSound : public CSoundBase
-{
+{
-public:
+public:
-    CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
+    CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
-    virtual ~CSound() {}
+    virtual ~CSound() {}
-
+
-    virtual int  Init ( const int iNewPrefMonoBufferSize );
+    virtual int  Init ( const int iNewPrefMonoBufferSize );
-    virtual void Start();
+    virtual void Start();
-    virtual void Stop();
+    virtual void Stop();
-
+
-    // these variables should be protected but cannot since we want
+    // these variables should be protected but cannot since we want
-    // to access them from the callback function
+    // to access them from the callback function
-    CVector<short> vecsTmpAudioSndCrdStereo;
+    CVector<short> vecsTmpAudioSndCrdStereo;
-
+
-// TEST
+// TEST
-CVector<short> vecsTmpAudioInSndCrd;
+CVector<short> vecsTmpAudioInSndCrd;
-int            iModifiedInBufSize;
+int            iModifiedInBufSize;
-
+
-    int            iOpenSLBufferSizeMono;
+    int            iOpenSLBufferSizeMono;
-    int            iOpenSLBufferSizeStereo;
+    int            iOpenSLBufferSizeStereo;
-
+
-protected:
+protected:
-
+
-    void InitializeOpenSL();
+    void InitializeOpenSL();
-    void CloseOpenSL();
+    void CloseOpenSL();
-
+
-    // callbacks
+    // callbacks
-    static void processInput ( SLAndroidSimpleBufferQueueItf bufferQueue,
+    static void processInput ( SLAndroidSimpleBufferQueueItf bufferQueue,
-                               void*                         instance );
+                               void*                         instance );
-
+
-    static void processOutput ( SLAndroidSimpleBufferQueueItf bufferQueue,
+    static void processOutput ( SLAndroidSimpleBufferQueueItf bufferQueue,
-                                void*                         instance );
+                                void*                         instance );
-
+
-    SLObjectItf                   engineObject;
+    SLObjectItf                   engineObject;
-    SLEngineItf                   engine;
+    SLEngineItf                   engine;
-    SLObjectItf                   recorderObject;
+    SLObjectItf                   recorderObject;
-    SLRecordItf                   recorder;
+    SLRecordItf                   recorder;
-    SLAndroidSimpleBufferQueueItf recorderSimpleBufQueue;
+    SLAndroidSimpleBufferQueueItf recorderSimpleBufQueue;
-    SLObjectItf                   outputMixObject;
+    SLObjectItf                   outputMixObject;
-    SLObjectItf                   playerObject;
+    SLObjectItf                   playerObject;
-    SLPlayItf                     player;
+    SLPlayItf                     player;
-    SLAndroidSimpleBufferQueueItf playerSimpleBufQueue;
+    SLAndroidSimpleBufferQueueItf playerSimpleBufQueue;
-
+
-    QMutex                        Mutex;
+    QMutex                        Mutex;
-
+
-};
+};
-
+
-#endif // !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)
+#endif // !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)

linux/sound.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

linux/sound.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

mac/sound.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

mac/sound.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/aboutdlgbase.ui

@@ -133,7 +133,7 @@
            <item>
             <widget class="QLabel" name="lblCopyright" >
              <property name="text" >
-              <string>Copyright (C) 2005-2014</string>
+              <string>Copyright (C) 2005-2015</string>
              </property>
              <property name="wordWrap" >
               <bool>false</bool>

src/analyzerconsole.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer 

src/analyzerconsole.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/audiomixerboard.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer 

src/audiomixerboard.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/buffer.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/buffer.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/channel.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/channel.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/chatdlg.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/chatdlg.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/client.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/client.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/clientdlg.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/clientdlg.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/clientsettingsdlg.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/clientsettingsdlg.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/connectdlg.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/connectdlg.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/global.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * \copyright (c) 2004-2014
+ * \copyright (c) 2004-2015
  * \author    Volker Fischer
  *
 

src/main.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/multicolorled.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/multicolorled.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/multicolorledbar.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/multicolorledbar.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/protocol.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/protocol.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/server.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/server.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverdlg.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverdlg.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverlist.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverlist.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverlogging.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/serverlogging.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/settings.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/settings.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/socket.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/socket.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/soundbase.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/soundbase.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/testbench.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/util.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

src/util.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

windows/sound.cpp

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer

windows/sound.h

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2014
+ * Copyright (c) 2004-2015
  *
  * Author(s):
  *  Volker Fischer