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

change all 2014 to 2015

Browse source
This commit is contained in:
Volker Fischer 2015-02-04 18:17:23 +00:00
parent a26fc768bf
commit 33e5a07cf7
53 changed files with 134 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

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

2
android/sound.cpp
View file

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

166
android/sound.h
View file

@ -1,83 +1,83 @@
/******************************************************************************\
* 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_3638457H73245GUIG9__INCLUDED_)
#define _SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_
#include <SLES/OpenSLES.h>
#include <SLES/OpenSLES_Android.h>
#include <QMutex>
#include "soundbase.h"
#include "global.h"
/* Classes ********************************************************************/
class CSound : public CSoundBase
{
public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
virtual ~CSound() {}
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;
// TEST
CVector<short> vecsTmpAudioInSndCrd;
int iModifiedInBufSize;
int iOpenSLBufferSizeMono;
int iOpenSLBufferSizeStereo;
protected:
void InitializeOpenSL();
void CloseOpenSL();
// callbacks
static void processInput ( SLAndroidSimpleBufferQueueItf bufferQueue,
void* instance );
static void processOutput ( SLAndroidSimpleBufferQueueItf bufferQueue,
void* instance );
SLObjectItf engineObject;
SLEngineItf engine;
SLObjectItf recorderObject;
SLRecordItf recorder;
SLAndroidSimpleBufferQueueItf recorderSimpleBufQueue;
SLObjectItf outputMixObject;
SLObjectItf playerObject;
SLPlayItf player;
SLAndroidSimpleBufferQueueItf playerSimpleBufQueue;
QMutex Mutex;
};
#endif // !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)
/******************************************************************************\
* Copyright (c) 2004-2015
*
* 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_3638457H73245GUIG9__INCLUDED_)
#define _SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_
#include <SLES/OpenSLES.h>
#include <SLES/OpenSLES_Android.h>
#include <QMutex>
#include "soundbase.h"
#include "global.h"
/* Classes ********************************************************************/
class CSound : public CSoundBase
{
public:
CSound ( void (*fpNewProcessCallback) ( CVector<short>& psData, void* arg ), void* arg );
virtual ~CSound() {}
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;
// TEST
CVector<short> vecsTmpAudioInSndCrd;
int iModifiedInBufSize;
int iOpenSLBufferSizeMono;
int iOpenSLBufferSizeStereo;
protected:
void InitializeOpenSL();
void CloseOpenSL();
// callbacks
static void processInput ( SLAndroidSimpleBufferQueueItf bufferQueue,
void* instance );
static void processOutput ( SLAndroidSimpleBufferQueueItf bufferQueue,
void* instance );
SLObjectItf engineObject;
SLEngineItf engine;
SLObjectItf recorderObject;
SLRecordItf recorder;
SLAndroidSimpleBufferQueueItf recorderSimpleBufQueue;
SLObjectItf outputMixObject;
SLObjectItf playerObject;
SLPlayItf player;
SLAndroidSimpleBufferQueueItf playerSimpleBufQueue;
QMutex Mutex;
};
#endif // !defined(_SOUND_H__9518A621345F78_3638457H73245GUIG9__INCLUDED_)

2
linux/sound.cpp
View file

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

2
linux/sound.h
View file

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

2
mac/sound.cpp
View file

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

2
mac/sound.h
View file

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

2
src/aboutdlgbase.ui
View file

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

2
src/analyzerconsole.cpp
View file

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

2
src/analyzerconsole.h
View file

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

2
src/audiomixerboard.cpp
View file

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

2
src/audiomixerboard.h
View file

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

2
src/buffer.cpp
View file

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

2
src/buffer.h
View file

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

2
src/channel.cpp
View file

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

2
src/channel.h
View file

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

2
src/chatdlg.cpp
View file

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

2
src/chatdlg.h
View file

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

2
src/client.cpp
View file

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

2
src/client.h
View file

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

2
src/clientdlg.cpp
View file

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

2
src/clientdlg.h
View file

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

2
src/clientsettingsdlg.cpp
View file

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

2
src/clientsettingsdlg.h
View file

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

2
src/connectdlg.cpp
View file

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

2
src/connectdlg.h
View file

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

2
src/global.h
View file

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

2
src/main.cpp
View file

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

2
src/multicolorled.cpp
View file

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

2
src/multicolorled.h
View file

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

2
src/multicolorledbar.cpp
View file

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

2
src/multicolorledbar.h
View file

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

2
src/protocol.cpp
View file

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

2
src/protocol.h
View file

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

2
src/server.cpp
View file

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

2
src/server.h
View file

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

2
src/serverdlg.cpp
View file

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

2
src/serverdlg.h
View file

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

2
src/serverlist.cpp
View file

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

2
src/serverlist.h
View file

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

2
src/serverlogging.cpp
View file

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

2
src/serverlogging.h
View file

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

2
src/settings.cpp
View file

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

2
src/settings.h
View file

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

2
src/socket.cpp
View file

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

2
src/socket.h
View file

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

2
src/soundbase.cpp
View file

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

2
src/soundbase.h
View file

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

2
src/testbench.h
View file

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

2
src/util.cpp
View file

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

2
src/util.h
View file

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

2
windows/sound.cpp
View file

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

2
windows/sound.h
View file

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