From 6fb8df486f5f33605665243430d368efc8f8b32f Mon Sep 17 00:00:00 2001 From: Dave French Date: Tue, 16 Dec 2014 14:25:56 +0000 Subject: [PATCH] EQ changed file and directory names to CamelCase --- plugins/CMakeLists.txt | 2 +- plugins/{eq => Eq}/CMakeLists.txt | 4 ++-- plugins/{eq/eqcontrols.cpp => Eq/EqControls.cpp} | 4 ++-- plugins/{eq/eqcontrols.h => Eq/EqControls.h} | 2 +- .../EqControlsDialog.cpp} | 8 ++++---- .../eqcontrolsdialog.h => Eq/EqControlsDialog.h} | 4 ++-- plugins/{eq/eqeffect.cpp => Eq/EqEffect.cpp} | 6 +++--- plugins/{eq/eqeffect.h => Eq/EqEffect.h} | 4 ++-- plugins/{eq/eqfader.h => Eq/EqFader.h} | 0 plugins/{eq/eqfilter.h => Eq/EqFilter.h} | 0 .../EqParameterWidget.cpp} | 6 +++--- .../eqparameterwidget.h => Eq/EqParameterWidget.h} | 0 .../{eq/eqspectrumview.h => Eq/EqSpectrumView.h} | 0 plugins/{eq => Eq}/artwork.png | Bin plugins/{eq => Eq}/logo.png | Bin 15 files changed, 20 insertions(+), 20 deletions(-) rename plugins/{eq => Eq}/CMakeLists.txt (55%) rename plugins/{eq/eqcontrols.cpp => Eq/EqControls.cpp} (99%) rename plugins/{eq/eqcontrols.h => Eq/EqControls.h} (99%) rename plugins/{eq/eqcontrolsdialog.cpp => Eq/EqControlsDialog.cpp} (98%) rename plugins/{eq/eqcontrolsdialog.h => Eq/EqControlsDialog.h} (97%) rename plugins/{eq/eqeffect.cpp => Eq/EqEffect.cpp} (99%) rename plugins/{eq/eqeffect.h => Eq/EqEffect.h} (98%) rename plugins/{eq/eqfader.h => Eq/EqFader.h} (100%) rename plugins/{eq/eqfilter.h => Eq/EqFilter.h} (100%) rename plugins/{eq/eqparameterwidget.cpp => Eq/EqParameterWidget.cpp} (97%) rename plugins/{eq/eqparameterwidget.h => Eq/EqParameterWidget.h} (100%) rename plugins/{eq/eqspectrumview.h => Eq/EqSpectrumView.h} (100%) rename plugins/{eq => Eq}/artwork.png (100%) rename plugins/{eq => Eq}/logo.png (100%) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 7807ff544..63c80538e 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -10,7 +10,7 @@ ADD_SUBDIRECTORY(CrossoverEQ) ADD_SUBDIRECTORY(delay) ADD_SUBDIRECTORY(DualFilter) ADD_SUBDIRECTORY(dynamics_processor) -ADD_SUBDIRECTORY(eq) +ADD_SUBDIRECTORY(Eq) ADD_SUBDIRECTORY(flanger) ADD_SUBDIRECTORY(flp_import) ADD_SUBDIRECTORY(HydrogenImport) diff --git a/plugins/eq/CMakeLists.txt b/plugins/Eq/CMakeLists.txt similarity index 55% rename from plugins/eq/CMakeLists.txt rename to plugins/Eq/CMakeLists.txt index 9b471d5b6..294005af0 100644 --- a/plugins/eq/CMakeLists.txt +++ b/plugins/Eq/CMakeLists.txt @@ -2,5 +2,5 @@ INCLUDE(BuildPlugin) INCLUDE_DIRECTORIES(${FFTW3F_INCLUDE_DIRS}) LINK_DIRECTORIES(${FFTW3F_LIBRARY_DIRS}) LINK_LIBRARIES(${FFTW3F_LIBRARIES}) -BUILD_PLUGIN(eq eqeffect.cpp eqcontrols.cpp eqcontrolsdialog.cpp eqfilter.h eqparameterwidget.cpp eqfader.h eqspectrumview.h ../../src/gui/widgets/Fader.cpp -MOCFILES eqcontrols.h eqparameterwidget.h eqfader.h ../../include/Fader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") +BUILD_PLUGIN(eq EqEffect.cpp EqControls.cpp EqControlsDialog.cpp EqFilter.h EqParameterWidget.cpp EqFader.h EqSpectrumView.h ../../src/gui/widgets/Fader.cpp +MOCFILES EqControls.h EqParameterWidget.h EqFader.h ../../include/Fader.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png") diff --git a/plugins/eq/eqcontrols.cpp b/plugins/Eq/EqControls.cpp similarity index 99% rename from plugins/eq/eqcontrols.cpp rename to plugins/Eq/EqControls.cpp index 82cb11191..62d71cabc 100644 --- a/plugins/eq/eqcontrols.cpp +++ b/plugins/Eq/EqControls.cpp @@ -23,8 +23,8 @@ */ #include -#include "eqcontrols.h" -#include "eqeffect.h" +#include "EqControls.h" +#include "EqEffect.h" diff --git a/plugins/eq/eqcontrols.h b/plugins/Eq/EqControls.h similarity index 99% rename from plugins/eq/eqcontrols.h rename to plugins/Eq/EqControls.h index f3646cce6..eec745b6f 100644 --- a/plugins/eq/eqcontrols.h +++ b/plugins/Eq/EqControls.h @@ -26,7 +26,7 @@ #define EQCONTROLS_H #include "EffectControls.h" -#include "eqcontrolsdialog.h" +#include "EqControlsDialog.h" #include "Knob.h" class EqEffect; diff --git a/plugins/eq/eqcontrolsdialog.cpp b/plugins/Eq/EqControlsDialog.cpp similarity index 98% rename from plugins/eq/eqcontrolsdialog.cpp rename to plugins/Eq/EqControlsDialog.cpp index 57ba248de..950ed1272 100644 --- a/plugins/eq/eqcontrolsdialog.cpp +++ b/plugins/Eq/EqControlsDialog.cpp @@ -23,17 +23,17 @@ */ -#include "eqcontrolsdialog.h" -#include "eqcontrols.h" +#include "EqControlsDialog.h" +#include "EqControls.h" #include "embed.h" #include "Fader.h" -#include "eqfader.h" +#include "EqFader.h" #include "Engine.h" #include "AutomatableButton.h" #include "QWidget" #include "MainWindow.h" #include "LedCheckbox.h" -//#include "eqspectrumview.h" + diff --git a/plugins/eq/eqcontrolsdialog.h b/plugins/Eq/EqControlsDialog.h similarity index 97% rename from plugins/eq/eqcontrolsdialog.h rename to plugins/Eq/EqControlsDialog.h index bda074f4a..d220d51ad 100644 --- a/plugins/eq/eqcontrolsdialog.h +++ b/plugins/Eq/EqControlsDialog.h @@ -29,10 +29,10 @@ #include "Fader.h" #include "Knob.h" #include "LedCheckbox.h" -#include "eqparameterwidget.h" +#include "EqParameterWidget.h" #include "MainWindow.h" #include "qpushbutton.h" -#include "eqspectrumview.h" +#include "EqSpectrumView.h" class EqControls; diff --git a/plugins/eq/eqeffect.cpp b/plugins/Eq/EqEffect.cpp similarity index 99% rename from plugins/eq/eqeffect.cpp rename to plugins/Eq/EqEffect.cpp index 19f990479..75b7c8bb1 100644 --- a/plugins/eq/eqeffect.cpp +++ b/plugins/Eq/EqEffect.cpp @@ -22,7 +22,7 @@ * */ -#include "eqeffect.h" +#include "EqEffect.h" #include "embed.cpp" #include "lmms_math.h" #include "BasicFilters.h" @@ -53,11 +53,11 @@ EqEffect::EqEffect(Model *parent, const Plugin::Descriptor::SubPluginFeatures::K Effect( &eq_plugin_descriptor, parent, key ), m_eqControls( this ) { - m_dFilterCount = 6; + m_dFilterCount = 4; m_downsampleFilters = new EqLinkwitzRiley[m_dFilterCount]; for( int i = 0; i < m_dFilterCount; i++) { - m_downsampleFilters[i].setFrequency(20000); + m_downsampleFilters[i].setFrequency(21000); m_downsampleFilters[i].setSR(Engine::mixer()->processingSampleRate() * 2 ); } m_upBuf = 0; diff --git a/plugins/eq/eqeffect.h b/plugins/Eq/EqEffect.h similarity index 98% rename from plugins/eq/eqeffect.h rename to plugins/Eq/EqEffect.h index a2e660cc2..9a4cd9411 100644 --- a/plugins/eq/eqeffect.h +++ b/plugins/Eq/EqEffect.h @@ -26,10 +26,10 @@ #define EQEFFECT_H #include "Effect.h" -#include "eqcontrols.h" +#include "EqControls.h" #include "lmms_math.h" #include "BasicFilters.h" -#include "eqfilter.h" +#include "EqFilter.h" diff --git a/plugins/eq/eqfader.h b/plugins/Eq/EqFader.h similarity index 100% rename from plugins/eq/eqfader.h rename to plugins/Eq/EqFader.h diff --git a/plugins/eq/eqfilter.h b/plugins/Eq/EqFilter.h similarity index 100% rename from plugins/eq/eqfilter.h rename to plugins/Eq/EqFilter.h diff --git a/plugins/eq/eqparameterwidget.cpp b/plugins/Eq/EqParameterWidget.cpp similarity index 97% rename from plugins/eq/eqparameterwidget.cpp rename to plugins/Eq/EqParameterWidget.cpp index 735c7b72f..cafe5ac23 100644 --- a/plugins/eq/eqparameterwidget.cpp +++ b/plugins/Eq/EqParameterWidget.cpp @@ -22,7 +22,7 @@ * */ -#include "eqparameterwidget.h" +#include "EqParameterWidget.h" #include "QPainter" #include "qwidget.h" #include "lmms_math.h" @@ -94,8 +94,8 @@ void EqParameterWidget::paintEvent( QPaintEvent *event ) m_bands[i].x = x; m_bands[i].y = y; const int radius = 7; painter.drawEllipse( x - radius , y - radius, radius * 2 ,radius * 2 ); - QString msg = QString ("%1").arg (QString::number (i + 1)); - painter.drawText(x - (radius * 0.5), y + (radius * 0.85 ), msg ); + QString msg = QString ( "%1" ).arg ( QString::number (i + 1) ); + painter.drawText(x - ( radius * 0.5 ), y + ( radius * 0.85 ), msg ); painter.setPen( QPen( m_bands[i].color, 1, Qt::SolidLine, Qt::SquareCap, Qt::BevelJoin ) ); if( i == 0 || i == bandCount() - 1 ) { diff --git a/plugins/eq/eqparameterwidget.h b/plugins/Eq/EqParameterWidget.h similarity index 100% rename from plugins/eq/eqparameterwidget.h rename to plugins/Eq/EqParameterWidget.h diff --git a/plugins/eq/eqspectrumview.h b/plugins/Eq/EqSpectrumView.h similarity index 100% rename from plugins/eq/eqspectrumview.h rename to plugins/Eq/EqSpectrumView.h diff --git a/plugins/eq/artwork.png b/plugins/Eq/artwork.png similarity index 100% rename from plugins/eq/artwork.png rename to plugins/Eq/artwork.png diff --git a/plugins/eq/logo.png b/plugins/Eq/logo.png similarity index 100% rename from plugins/eq/logo.png rename to plugins/Eq/logo.png