Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.
This commit is contained in:
jthedering committed
1 parent
a1be4cc70f
commit
57e8158efd
202 files changed
+4595
-4284
No files matched your search
+40
-40
@@ -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"
|
||||
@@ -50,34 +50,34 @@ vector<wstring> CopyFilter::initialize(float sampleRate, unsigned maxFrameCount,
|
||||
|
||||
vector<wstring> outChannelNames;
|
||||
|
||||
for(unsigned i=0; i<assignmentCount; i++)
|
||||
for (unsigned i = 0; i < assignmentCount; i++)
|
||||
{
|
||||
InternalAssignment& ia = internalAssignments[i];
|
||||
Assignment& a = assignments[i];
|
||||
|
||||
wstring channelName = a.targetChannel;
|
||||
int channelIndex = ChannelHelper::getChannelIndex(a.targetChannel, channelNames, true);
|
||||
if(channelIndex != -1)
|
||||
if (channelIndex != -1)
|
||||
channelName = channelNames[channelIndex];
|
||||
vector<wstring>::const_iterator it = find(outChannelNames.begin(), outChannelNames.end(), channelName);
|
||||
ia.targetChannel = (int)(it-outChannelNames.begin());
|
||||
if(it == outChannelNames.end())
|
||||
ia.targetChannel = (int)(it - outChannelNames.begin());
|
||||
if (it == outChannelNames.end())
|
||||
outChannelNames.push_back(channelName);
|
||||
|
||||
ia.sourceCount = (unsigned)a.sourceSum.size();
|
||||
ia.sourceSum = (InternalAssignment::InternalSummand*)MemoryHelper::alloc(ia.sourceCount * sizeof(InternalAssignment::InternalSummand));
|
||||
|
||||
for(unsigned j=0; j<ia.sourceCount; j++)
|
||||
for (unsigned j = 0; j < ia.sourceCount; j++)
|
||||
{
|
||||
InternalAssignment::InternalSummand& is = ia.sourceSum[j];
|
||||
Assignment::Summand& s = a.sourceSum[j];
|
||||
|
||||
if(s.channel != L"")
|
||||
if (s.channel != L"")
|
||||
is.channel = ChannelHelper::getChannelIndex(s.channel, channelNames);
|
||||
else
|
||||
is.channel = -1;
|
||||
|
||||
if(s.isDecibel)
|
||||
if (s.isDecibel)
|
||||
is.factor = (float)pow(10.0, s.factor / 20.0);
|
||||
else
|
||||
is.factor = (float)s.factor;
|
||||
@@ -86,18 +86,18 @@ vector<wstring> CopyFilter::initialize(float sampleRate, unsigned maxFrameCount,
|
||||
|
||||
wstringstream stream;
|
||||
stream << "Copying ";
|
||||
for(unsigned i=0; i<assignmentCount; i++)
|
||||
for (unsigned i = 0; i < assignmentCount; i++)
|
||||
{
|
||||
InternalAssignment& ia = internalAssignments[i];
|
||||
if(i > 0)
|
||||
if (i > 0)
|
||||
stream << ", ";
|
||||
stream << L"to channel " << outChannelNames[ia.targetChannel].c_str() << " ";
|
||||
for(unsigned j=0; j<ia.sourceCount; j++)
|
||||
for (unsigned j = 0; j < ia.sourceCount; j++)
|
||||
{
|
||||
InternalAssignment::InternalSummand& is = ia.sourceSum[j];
|
||||
if(j > 0)
|
||||
if (j > 0)
|
||||
stream << ", ";
|
||||
if(is.channel != -1)
|
||||
if (is.channel != -1)
|
||||
stream << L"from channel " << channelNames[is.channel].c_str() << L" with factor " << is.factor;
|
||||
else
|
||||
stream << L"value " << is.factor;
|
||||
@@ -111,38 +111,38 @@ vector<wstring> CopyFilter::initialize(float sampleRate, unsigned maxFrameCount,
|
||||
#pragma AVRT_CODE_BEGIN
|
||||
void CopyFilter::process(float** output, float** input, unsigned frameCount)
|
||||
{
|
||||
for(unsigned i=0; i<assignmentCount; i++)
|
||||
for (unsigned i = 0; i < assignmentCount; i++)
|
||||
{
|
||||
InternalAssignment& ia = internalAssignments[i];
|
||||
|
||||
if(ia.targetChannel == -1 || ia.sourceCount == 0)
|
||||
if (ia.targetChannel == -1 || ia.sourceCount == 0)
|
||||
continue;
|
||||
|
||||
{
|
||||
InternalAssignment::InternalSummand& is = ia.sourceSum[0];
|
||||
|
||||
if(is.channel == -1)
|
||||
for(unsigned f=0; f<frameCount; f++)
|
||||
if (is.channel == -1)
|
||||
for (unsigned f = 0; f < frameCount; f++)
|
||||
output[ia.targetChannel][f] = is.factor;
|
||||
else if(is.factor == 1.0)
|
||||
else if (is.factor == 1.0)
|
||||
memcpy(output[ia.targetChannel], input[is.channel], frameCount * sizeof(float));
|
||||
else
|
||||
for(unsigned f=0; f<frameCount; f++)
|
||||
for (unsigned f = 0; f < frameCount; f++)
|
||||
output[ia.targetChannel][f] = is.factor * input[is.channel][f];
|
||||
}
|
||||
|
||||
for(unsigned j=1; j<ia.sourceCount; j++)
|
||||
for (unsigned j = 1; j < ia.sourceCount; j++)
|
||||
{
|
||||
InternalAssignment::InternalSummand& is = ia.sourceSum[j];
|
||||
|
||||
if(is.channel == -1)
|
||||
for(unsigned f=0; f<frameCount; f++)
|
||||
if (is.channel == -1)
|
||||
for (unsigned f = 0; f < frameCount; f++)
|
||||
output[ia.targetChannel][f] += is.factor;
|
||||
else if(is.factor == 1.0)
|
||||
for(unsigned f=0; f<frameCount; f++)
|
||||
else if (is.factor == 1.0)
|
||||
for (unsigned f = 0; f < frameCount; f++)
|
||||
output[ia.targetChannel][f] += input[is.channel][f];
|
||||
else
|
||||
for(unsigned f=0; f<frameCount; f++)
|
||||
for (unsigned f = 0; f < frameCount; f++)
|
||||
output[ia.targetChannel][f] += is.factor * input[is.channel][f];
|
||||
}
|
||||
}
|
||||
@@ -151,12 +151,12 @@ void CopyFilter::process(float** output, float** input, unsigned frameCount)
|
||||
|
||||
void CopyFilter::cleanup()
|
||||
{
|
||||
if(internalAssignments != NULL)
|
||||
if (internalAssignments != NULL)
|
||||
{
|
||||
for(unsigned i=0; i<assignmentCount; i++)
|
||||
for (unsigned i = 0; i < assignmentCount; i++)
|
||||
{
|
||||
InternalAssignment& ia = internalAssignments[i];
|
||||
if(ia.sourceSum != NULL)
|
||||
if (ia.sourceSum != NULL)
|
||||
{
|
||||
MemoryHelper::free(ia.sourceSum);
|
||||
ia.sourceSum = NULL;
|
||||
|
||||
Reference in new issue
Block a user