update to 2014

README

@@ -1,5 +1,5 @@
 /******************************************************************************\
- * Copyright (c) 2004-2013
+ * Copyright (c) 2004-2014
  *
  * Author(s):
  *	Volker Fischer
@@ -23,7 +23,7 @@
 \******************************************************************************/
 
 Jamulus - Internet Jam Session Software
-------------------------------------
+---------------------------------------
 
 Low-Latency (Internet) Connection tool
 Under the GNU General Public License (GPL)

linux/sound.cpp

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

linux/sound.h

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

mac/sound.cpp

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

mac/sound.h

@@ -1,107 +1,107 @@
-/******************************************************************************\
+/******************************************************************************\
- * Copyright (c) 2004-2011
+ * Copyright (c) 2004-2014
- *
+ *
- * 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_363456876UZGSDF82CF549__INCLUDED_)
+#if !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)
-#define _SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_
+#define _SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_
-
+
-#include <CoreServices/CoreServices.h>
+#include <CoreServices/CoreServices.h>
-#include <AudioUnit/AudioUnit.h>
+#include <AudioUnit/AudioUnit.h>
-#include <CoreAudio/AudioHardware.h>
+#include <CoreAudio/AudioHardware.h>
-#include <QMutex>
+#include <QMutex>
-#include "util.h"
+#include "util.h"
-#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() { CloseCoreAudio(); }
+    virtual ~CSound() { CloseCoreAudio(); }
-
+
-    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;
-    int            iCoreAudioBufferSizeMono;
+    int            iCoreAudioBufferSizeMono;
-    int            iCoreAudioBufferSizeStereo;
+    int            iCoreAudioBufferSizeStereo;
-
+
-protected:
+protected:
-    virtual QString  LoadAndInitializeDriver ( int iIdx );
+    virtual QString  LoadAndInitializeDriver ( int iIdx );
-
+
-    QString CheckDeviceCapabilities ( ComponentInstance& NewAudioInputUnit,
+    QString CheckDeviceCapabilities ( ComponentInstance& NewAudioInputUnit,
-                                      ComponentInstance& NewAudioOutputUnit );
+                                      ComponentInstance& NewAudioOutputUnit );
-
+
-    void CloseCoreAudio();
+    void CloseCoreAudio();
-
+
-    UInt32 SetBufferSize ( AudioDeviceID& audioDeviceID,
+    UInt32 SetBufferSize ( AudioDeviceID& audioDeviceID,
-                           const bool     bIsInput,
+                           const bool     bIsInput,
-                           UInt32         iPrefBufferSize );
+                           UInt32         iPrefBufferSize );
-
+
-    void GetAudioDeviceInfos ( const AudioDeviceID DeviceID,
+    void GetAudioDeviceInfos ( const AudioDeviceID DeviceID,
-                               QString&            strDeviceName,
+                               QString&            strDeviceName,
-                               bool&               bIsInput,
+                               bool&               bIsInput,
-                               bool&               bIsOutput );
+                               bool&               bIsOutput );
-
+
-    // callbacks
+    // callbacks
-    static OSStatus deviceNotification ( AudioDeviceID,
+    static OSStatus deviceNotification ( AudioDeviceID,
-                                         UInt32,
+                                         UInt32,
-                                         Boolean,
+                                         Boolean,
-                                         AudioDevicePropertyID inPropertyID,
+                                         AudioDevicePropertyID inPropertyID,
-                                         void*                 inRefCon );
+                                         void*                 inRefCon );
-
+
-    static OSStatus processInput ( void*                       inRefCon,
+    static OSStatus processInput ( void*                       inRefCon,
-                                   AudioUnitRenderActionFlags* ioActionFlags,
+                                   AudioUnitRenderActionFlags* ioActionFlags,
-                                   const AudioTimeStamp*       inTimeStamp,
+                                   const AudioTimeStamp*       inTimeStamp,
-                                   UInt32                      inBusNumber,
+                                   UInt32                      inBusNumber,
-                                   UInt32                      inNumberFrames,
+                                   UInt32                      inNumberFrames,
-                                   AudioBufferList* );
+                                   AudioBufferList* );
-
+
-    static OSStatus processOutput ( void*                       inRefCon,
+    static OSStatus processOutput ( void*                       inRefCon,
-                                    AudioUnitRenderActionFlags*,
+                                    AudioUnitRenderActionFlags*,
-                                    const AudioTimeStamp*,
+                                    const AudioTimeStamp*,
-                                    UInt32,
+                                    UInt32,
-                                    UInt32,
+                                    UInt32,
-                                    AudioBufferList*            ioData );
+                                    AudioBufferList*            ioData );
-
+
-    AudioStreamBasicDescription streamFormat;
+    AudioStreamBasicDescription streamFormat;
-
+
-    AURenderCallbackStruct      inputCallbackStruct;
+    AURenderCallbackStruct      inputCallbackStruct;
-    AURenderCallbackStruct      outputCallbackStruct;
+    AURenderCallbackStruct      outputCallbackStruct;
-
+
-    ComponentInstance           audioInputUnit;
+    ComponentInstance           audioInputUnit;
-    AudioDeviceID               audioInputDevice[MAX_NUMBER_SOUND_CARDS];
+    AudioDeviceID               audioInputDevice[MAX_NUMBER_SOUND_CARDS];
-    ComponentInstance           audioOutputUnit;
+    ComponentInstance           audioOutputUnit;
-    AudioDeviceID               audioOutputDevice[MAX_NUMBER_SOUND_CARDS];
+    AudioDeviceID               audioOutputDevice[MAX_NUMBER_SOUND_CARDS];
-
+
-    AudioBufferList*            pBufferList;
+    AudioBufferList*            pBufferList;
-
+
-    QMutex                      Mutex;
+    QMutex                      Mutex;
-};
+};
-
+
-#endif // !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)
+#endif // !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)

src/aboutdlgbase.ui

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

src/analyzerconsole.cpp

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

src/analyzerconsole.h

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

src/audiomixerboard.cpp

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

src/audiomixerboard.h

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

src/buffer.cpp

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

src/buffer.h

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

src/channel.cpp

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

src/channel.h

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

src/chatdlg.cpp

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

src/chatdlg.h

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

src/client.cpp

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

src/client.h

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

src/clientdlg.cpp

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

src/clientdlg.h

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

src/clientsettingsdlg.cpp

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

src/clientsettingsdlg.h

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

src/connectdlg.cpp

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

src/connectdlg.h

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

src/global.h

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

src/main.cpp

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

src/multicolorled.cpp

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

src/multicolorled.h

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

src/multicolorledbar.cpp

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

src/multicolorledbar.h

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

src/protocol.cpp

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

src/protocol.h

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

src/server.cpp

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

src/server.h

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

src/serverdlg.cpp

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

src/serverdlg.h

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

src/serverlist.cpp

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

src/serverlist.h

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

src/serverlogging.cpp

@@ -1,25 +1,25 @@
 /******************************************************************************\
-* Copyright (c) 2004-2013
+ * Copyright (c) 2004-2014
-*
+ *
-* 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
-*
+ *
 \******************************************************************************/
 
 #include "serverlogging.h"

src/serverlogging.h

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

src/settings.cpp

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

src/settings.h

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

src/socket.cpp

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

src/socket.h

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

src/soundbase.cpp

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

src/soundbase.h

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

src/testbench.h

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

src/util.cpp

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

src/util.h

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

windows/sound.cpp

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

windows/sound.h

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