Fixed: Formatting was not applied for some files

This commit is contained in:
jthedering committed 2017-06-18 13:01:21 +00:00
1 parent 6f1409419f
commit fc9bb23711
12 files changed
+53 -60

No files matched your search

+9 -9
View File
@@ -169,14 +169,14 @@ int main(int argc, char** argv)
engine.initialize((float)sampleRate, channelCount, channelCount, channelCount, channelMask, batchsize); engine.initialize((float)sampleRate, channelCount, channelCount, channelCount, channelMask, batchsize);
double initTime = timer.stop(); double initTime = timer.stop();
if(!verbose) if (!verbose)
printf("\nLoading configuration took %g ms\n", initTime * 1000.0); printf("\nLoading configuration took %g ms\n", initTime * 1000.0);
printf("\nProcessing %d frames from %d channel(s)\n", frameCount, channelCount); printf("\nProcessing %d frames from %d channel(s)\n", frameCount, channelCount);
timer.start(); timer.start();
for(unsigned i = 0; i < frameCount; i += batchsize) for (unsigned i = 0; i < frameCount; i += batchsize)
{ {
engine.process(buf2 + i * channelCount, buf + i * channelCount, min(batchsize, frameCount - i)); engine.process(buf2 + i * channelCount, buf + i * channelCount, min(batchsize, frameCount - i));
} }
@@ -188,22 +188,22 @@ int main(int argc, char** argv)
unsigned clipCount = 0; unsigned clipCount = 0;
float max = 0; float max = 0;
for(unsigned i = 0; i < frameCount * channelCount; i++) for (unsigned i = 0; i < frameCount * channelCount; i++)
{ {
float f = fabs(buf2[i]); float f = fabs(buf2[i]);
if(f > max) if (f > max)
max = f; max = f;
if(f > 1.0f) if (f > 1.0f)
clipCount++; clipCount++;
} }
printf("Max output level: %f (%f dB)", max, log10(max) * 20.0f); printf("Max output level: %f (%f dB)", max, log10(max) * 20.0f);
if(clipCount > 0) if (clipCount > 0)
printf(" (%d samples clipped!)", clipCount); printf(" (%d samples clipped!)", clipCount);
printf("\n"); printf("\n");
string output = outputArg.getValue(); string output = outputArg.getValue();
if(output == "") if (output == "")
{ {
char temp[255]; char temp[255];
GetTempPathA(sizeof(temp) / sizeof(wchar_t), temp); GetTempPathA(sizeof(temp) / sizeof(wchar_t), temp);
@@ -216,14 +216,14 @@ int main(int argc, char** argv)
SF_INFO info = {frameCount, (int)sampleRate, (int)channelCount, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 0}; SF_INFO info = {frameCount, (int)sampleRate, (int)channelCount, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 0};
SNDFILE* outFile = sf_open(output.c_str(), SFM_WRITE, &info); SNDFILE* outFile = sf_open(output.c_str(), SFM_WRITE, &info);
if(outFile == NULL) if (outFile == NULL)
{ {
fprintf(stderr, "%s", sf_strerror(outFile)); fprintf(stderr, "%s", sf_strerror(outFile));
return 1; return 1;
} }
sf_count_t numWritten = 0; sf_count_t numWritten = 0;
while(numWritten < frameCount) while (numWritten < frameCount)
numWritten += sf_writef_float(outFile, buf2 + numWritten * channelCount, frameCount - numWritten); numWritten += sf_writef_float(outFile, buf2 + numWritten * channelCount, frameCount - numWritten);
sf_close(outFile); sf_close(outFile);
-1
View File
@@ -25,7 +25,6 @@ using namespace std;
AnalysisPlotScene::AnalysisPlotScene(QObject* parent) AnalysisPlotScene::AnalysisPlotScene(QObject* parent)
: FrequencyPlotScene(parent) : FrequencyPlotScene(parent)
{ {
} }
void AnalysisPlotScene::setFreqData(fftwf_complex* freqData, int frameCount, unsigned sampleRate) void AnalysisPlotScene::setFreqData(fftwf_complex* freqData, int frameCount, unsigned sampleRate)
+1 -1
View File
@@ -20,7 +20,7 @@
#include "Editor/helpers/DPIHelper.h" #include "Editor/helpers/DPIHelper.h"
CustomStyle::CustomStyle(QStyle* style) CustomStyle::CustomStyle(QStyle* style)
: QProxyStyle(style) : QProxyStyle(style)
{ {
} }
+16 -16
View File
@@ -1,20 +1,20 @@
/* /*
This file is part of EqualizerAPO, a system-wide equalizer. This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering Copyright (C) 2016 Jonas Thedering
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along 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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#pragma once #pragma once
@@ -23,10 +23,10 @@
class CustomStyle : public QProxyStyle class CustomStyle : public QProxyStyle
{ {
Q_OBJECT Q_OBJECT
public: public:
CustomStyle(QStyle* style); CustomStyle(QStyle* style);
int pixelMetric(PixelMetric metric, const QStyleOption* option, const QWidget* widget) const override; int pixelMetric(PixelMetric metric, const QStyleOption* option, const QWidget* widget) const override;
}; };
-1
View File
@@ -21,7 +21,6 @@
FilterTableMimeData::FilterTableMimeData() FilterTableMimeData::FilterTableMimeData()
{ {
} }
QList<QVariantMap> FilterTableMimeData::getPrefsList() const QList<QVariantMap> FilterTableMimeData::getPrefsList() const
-2
View File
@@ -22,10 +22,8 @@
IFilterGUI::IFilterGUI(QWidget* parent) IFilterGUI::IFilterGUI(QWidget* parent)
: QWidget(parent) : QWidget(parent)
{ {
} }
IFilterGUI::~IFilterGUI() IFilterGUI::~IFilterGUI()
{ {
} }
-1
View File
@@ -21,5 +21,4 @@
IFilterGUIFactory::~IFilterGUIFactory() IFilterGUIFactory::~IFilterGUIFactory()
{ {
} }
+13 -13
View File
@@ -1,20 +1,20 @@
/* /*
This file is part of Equalizer APO, a system-wide equalizer. This file is part of Equalizer APO, a system-wide equalizer.
Copyright (C) 2017 Jonas Thedering Copyright (C) 2017 Jonas Thedering
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along 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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#pragma once #pragma once
+13 -13
View File
@@ -1,20 +1,20 @@
/* /*
This file is part of EqualizerAPO, a system-wide equalizer. This file is part of EqualizerAPO, a system-wide equalizer.
Copyright (C) 2016 Jonas Thedering Copyright (C) 2016 Jonas Thedering
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License along 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., with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#include <QSize> #include <QSize>
-1
View File
@@ -29,5 +29,4 @@ public:
protected: protected:
QPointF getNextChannelPoint(QGraphicsItem* lastItem, bool output); QPointF getNextChannelPoint(QGraphicsItem* lastItem, bool output);
}; };
-1
View File
@@ -25,7 +25,6 @@ using namespace std;
ExponentialSpinBox::ExponentialSpinBox(QWidget* parent) ExponentialSpinBox::ExponentialSpinBox(QWidget* parent)
: QSpinBox(parent) : QSpinBox(parent)
{ {
} }
void ExponentialSpinBox::stepBy(int steps) void ExponentialSpinBox::stepBy(int steps)
+1 -1
View File
@@ -1,7 +1,7 @@
@echo off @echo off
cd %~dp0 cd %~dp0
for /r %%f in (*.cpp *.h) do ( for /r %%f in (*.cpp *.h) do (
(Echo "%%f" | FIND /I "\build-" 1>NUL) || (Echo "%%f" | FIND /I "\resource.h" 1>NUL) || (Echo "%%f" | FIND /I "\libHybridConv-0.1.1\" 1>NUL) || ( (Echo "%%f" | FIND /I "\build-" 1>NUL) || (Echo "%%f" | FIND /I "\resource.h" 1>NUL) || (Echo "%%f" | FIND /I "\libHybridConv-0.1.1\" 1>NUL) || (Echo "%%f" | FIND /I "\helpers\aeffectx.h" 1>NUL) || (Echo "%%f" | FIND /I "\helpers\UncaughtExceptions.h" 1>NUL) || (Echo "%%f" | FIND /I "\VoicemeeterClient\VoicemeeterRemote.h" 1>NUL) || (
uncrustify -c uncrustify.cfg -l CPP --no-backup "%%f" uncrustify -c uncrustify.cfg -l CPP --no-backup "%%f"
) )
) )