eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update to 2014

Browse source
This commit is contained in:
Volker Fischer 2014-01-05 16:52:38 +00:00
parent f26301ae75
commit c0a67a9884
51 changed files with 178 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README
View file

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

2
linux/sound.cpp
View file

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

2
linux/sound.h
View file

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

2
mac/sound.cpp
View file

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

214
mac/sound.h
View file

@ -1,107 +1,107 @@
/******************************************************************************\
* Copyright (c) 2004-2011
*
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
\******************************************************************************/
#if !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)
#define _SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_
#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
#include <CoreAudio/AudioHardware.h>
#include <QMutex>
#include "util.h"
#include "soundbase.h"
#include "global.h"
/* Classes ********************************************************************/
class CSound : public CSoundBase
{
public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
virtual ~CSound() { CloseCoreAudio(); }
virtual int Init ( const int iNewPrefMonoBufferSize );
virtual void Start();
virtual void Stop();
// these variables should be protected but cannot since we want
// to access them from the callback function
CVector<short> vecsTmpAudioSndCrdStereo;
int iCoreAudioBufferSizeMono;
int iCoreAudioBufferSizeStereo;
protected:
virtual QString LoadAndInitializeDriver ( int iIdx );
QString CheckDeviceCapabilities ( ComponentInstance& NewAudioInputUnit,
ComponentInstance& NewAudioOutputUnit );
void CloseCoreAudio();
UInt32 SetBufferSize ( AudioDeviceID& audioDeviceID,
const bool bIsInput,
UInt32 iPrefBufferSize );
void GetAudioDeviceInfos ( const AudioDeviceID DeviceID,
QString& strDeviceName,
bool& bIsInput,
bool& bIsOutput );
// callbacks
static OSStatus deviceNotification ( AudioDeviceID,
UInt32,
Boolean,
AudioDevicePropertyID inPropertyID,
void* inRefCon );
static OSStatus processInput ( void* inRefCon,
AudioUnitRenderActionFlags* ioActionFlags,
const AudioTimeStamp* inTimeStamp,
UInt32 inBusNumber,
UInt32 inNumberFrames,
AudioBufferList* );
static OSStatus processOutput ( void* inRefCon,
AudioUnitRenderActionFlags*,
const AudioTimeStamp*,
UInt32,
UInt32,
AudioBufferList* ioData );
AudioStreamBasicDescription streamFormat;
AURenderCallbackStruct inputCallbackStruct;
AURenderCallbackStruct outputCallbackStruct;
ComponentInstance audioInputUnit;
AudioDeviceID audioInputDevice[MAX_NUMBER_SOUND_CARDS];
ComponentInstance audioOutputUnit;
AudioDeviceID audioOutputDevice[MAX_NUMBER_SOUND_CARDS];
AudioBufferList* pBufferList;
QMutex Mutex;
};
#endif // !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)
/******************************************************************************\
* Copyright (c) 2004-2014
*
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
\******************************************************************************/
#if !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)
#define _SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_
#include <CoreServices/CoreServices.h>
#include <AudioUnit/AudioUnit.h>
#include <CoreAudio/AudioHardware.h>
#include <QMutex>
#include "util.h"
#include "soundbase.h"
#include "global.h"
/* Classes ********************************************************************/
class CSound : public CSoundBase
{
public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
virtual ~CSound() { CloseCoreAudio(); }
virtual int Init ( const int iNewPrefMonoBufferSize );
virtual void Start();
virtual void Stop();
// these variables should be protected but cannot since we want
// to access them from the callback function
CVector<short> vecsTmpAudioSndCrdStereo;
int iCoreAudioBufferSizeMono;
int iCoreAudioBufferSizeStereo;
protected:
virtual QString LoadAndInitializeDriver ( int iIdx );
QString CheckDeviceCapabilities ( ComponentInstance& NewAudioInputUnit,
ComponentInstance& NewAudioOutputUnit );
void CloseCoreAudio();
UInt32 SetBufferSize ( AudioDeviceID& audioDeviceID,
const bool bIsInput,
UInt32 iPrefBufferSize );
void GetAudioDeviceInfos ( const AudioDeviceID DeviceID,
QString& strDeviceName,
bool& bIsInput,
bool& bIsOutput );
// callbacks
static OSStatus deviceNotification ( AudioDeviceID,
UInt32,
Boolean,
AudioDevicePropertyID inPropertyID,
void* inRefCon );
static OSStatus processInput ( void* inRefCon,
AudioUnitRenderActionFlags* ioActionFlags,
const AudioTimeStamp* inTimeStamp,
UInt32 inBusNumber,
UInt32 inNumberFrames,
AudioBufferList* );
static OSStatus processOutput ( void* inRefCon,
AudioUnitRenderActionFlags*,
const AudioTimeStamp*,
UInt32,
UInt32,
AudioBufferList* ioData );
AudioStreamBasicDescription streamFormat;
AURenderCallbackStruct inputCallbackStruct;
AURenderCallbackStruct outputCallbackStruct;
ComponentInstance audioInputUnit;
AudioDeviceID audioInputDevice[MAX_NUMBER_SOUND_CARDS];
ComponentInstance audioOutputUnit;
AudioDeviceID audioOutputDevice[MAX_NUMBER_SOUND_CARDS];
AudioBufferList* pBufferList;
QMutex Mutex;
};
#endif // !defined(_SOUND_H__9518A621345F78_363456876UZGSDF82CF549__INCLUDED_)

2
src/aboutdlgbase.ui
View file

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

2
src/analyzerconsole.cpp
View file

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

2
src/analyzerconsole.h
View file

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

2
src/audiomixerboard.cpp
View file

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

2
src/audiomixerboard.h
View file

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

2
src/buffer.cpp
View file

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

2
src/buffer.h
View file

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

2
src/channel.cpp
View file

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

2
src/channel.h
View file

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

2
src/chatdlg.cpp
View file

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

2
src/chatdlg.h
View file

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

2
src/client.cpp
View file

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

2
src/client.h
View file

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

2
src/clientdlg.cpp
View file

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

2
src/clientdlg.h
View file

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

2
src/clientsettingsdlg.cpp
View file

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

2
src/clientsettingsdlg.h
View file

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

2
src/connectdlg.cpp
View file

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

2
src/connectdlg.h
View file

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

2
src/global.h
View file

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

2
src/main.cpp
View file

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

2
src/multicolorled.cpp
View file

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

2
src/multicolorled.h
View file

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

2
src/multicolorledbar.cpp
View file

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

2
src/multicolorledbar.h
View file

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

2
src/protocol.cpp
View file

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

2
src/protocol.h
View file

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

2
src/server.cpp
View file

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

2
src/server.h
View file

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

2
src/serverdlg.cpp
View file

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

2
src/serverdlg.h
View file

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

2
src/serverlist.cpp
View file

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

2
src/serverlist.h
View file

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

42
src/serverlogging.cpp
View file

@ -1,25 +1,25 @@
/******************************************************************************\
* Copyright (c) 2004-2013
*
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* Copyright (c) 2004-2014
*
* 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.,
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
\******************************************************************************/
#include "serverlogging.h"

2
src/serverlogging.h
View file

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

2
src/settings.cpp
View file

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

2
src/settings.h
View file

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

2
src/socket.cpp
View file

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

2
src/socket.h
View file

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

2
src/soundbase.cpp
View file

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

2
src/soundbase.h
View file

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

2
src/testbench.h
View file

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

2
src/util.cpp
View file

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

2
src/util.h
View file

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

2
windows/sound.cpp
View file

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

2
windows/sound.h
View file

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