Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.
This commit is contained in:
1 parent
a1be4cc70f
commit
57e8158efd
202 files changed
+4595
-4284
No files matched your search
+21
-21
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2014 Jonas Thedering
|
||||
|
||||
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 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.
|
||||
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.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
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.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
@@ -24,7 +24,7 @@
|
||||
using namespace std;
|
||||
|
||||
BiQuadFilter::BiQuadFilter(BiQuad::Type type, double dbGain, double freq, double bandwidthOrQOrS, bool isBandwidth, bool isCornerFreq)
|
||||
:type(type), dbGain(dbGain), freq(freq), bandwidthOrQOrS(bandwidthOrQOrS), isBandwidth(isBandwidth), isCornerFreq(isCornerFreq)
|
||||
: type(type), dbGain(dbGain), freq(freq), bandwidthOrQOrS(bandwidthOrQOrS), isBandwidth(isBandwidth), isCornerFreq(isCornerFreq)
|
||||
{
|
||||
channelCount = 0;
|
||||
biquads = NULL;
|
||||
@@ -32,7 +32,7 @@ BiQuadFilter::BiQuadFilter(BiQuad::Type type, double dbGain, double freq, double
|
||||
|
||||
BiQuadFilter::~BiQuadFilter()
|
||||
{
|
||||
if(biquads != NULL)
|
||||
if (biquads != NULL)
|
||||
{
|
||||
MemoryHelper::free(biquads);
|
||||
biquads = NULL;
|
||||
@@ -44,19 +44,19 @@ vector<wstring> BiQuadFilter::initialize(float sampleRate, unsigned maxFrameCoun
|
||||
this->channelCount = channelNames.size();
|
||||
biquads = (BiQuad*)MemoryHelper::alloc(channelCount * sizeof(BiQuad));
|
||||
double biquadFreq = freq;
|
||||
if(isCornerFreq && (type == BiQuad::LOW_SHELF || type == BiQuad::HIGH_SHELF))
|
||||
if (isCornerFreq && (type == BiQuad::LOW_SHELF || type == BiQuad::HIGH_SHELF))
|
||||
{
|
||||
// frequency adjustment for DCX2496
|
||||
double centerFreqFactor = pow(10.0, abs(dbGain) / 80.0 / bandwidthOrQOrS);
|
||||
if(type == BiQuad::LOW_SHELF)
|
||||
if (type == BiQuad::LOW_SHELF)
|
||||
biquadFreq *= centerFreqFactor;
|
||||
else
|
||||
biquadFreq /= centerFreqFactor;
|
||||
}
|
||||
|
||||
for(unsigned i=0; i<channelCount; i++)
|
||||
for (unsigned i = 0; i < channelCount; i++)
|
||||
{
|
||||
new (biquads + i) BiQuad(type, dbGain, biquadFreq, sampleRate, bandwidthOrQOrS, isBandwidth);
|
||||
new(biquads + i)BiQuad(type, dbGain, biquadFreq, sampleRate, bandwidthOrQOrS, isBandwidth);
|
||||
}
|
||||
|
||||
return channelNames;
|
||||
@@ -65,14 +65,14 @@ vector<wstring> BiQuadFilter::initialize(float sampleRate, unsigned maxFrameCoun
|
||||
#pragma AVRT_CODE_BEGIN
|
||||
void BiQuadFilter::process(float** output, float** input, unsigned frameCount)
|
||||
{
|
||||
for(unsigned i=0; i<channelCount; i++)
|
||||
for (unsigned i = 0; i < channelCount; i++)
|
||||
{
|
||||
BiQuad bq = biquads[i];
|
||||
|
||||
float* inputChannel = input[i];
|
||||
float* outputChannel = output[i];
|
||||
|
||||
for(unsigned j=0; j<frameCount; j++)
|
||||
for (unsigned j = 0; j < frameCount; j++)
|
||||
outputChannel[j] = (float)bq.process(inputChannel[j]);
|
||||
|
||||
bq.removeDenormals();
|
||||
|
||||
Reference in new issue
Block a user