change all 2014 to 2015

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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