No more anonymous namespaces

Chowdhury-DSP · Dec 6, 2023 · 6286a9a · 6286a9a
1 parent 97d6c0b
commit 6286a9a
Show file tree

Hide file tree

Showing 49 changed files with 425 additions and 425 deletions.
diff --git a/src/BYOD.cpp b/src/BYOD.cpp
@@ -3,16 +3,16 @@
 #include "state/StateManager.h"
 #include "state/presets/PresetManager.h"
 
-namespace
+namespace BYODPaths
 {
 const String settingsFilePath = "ChowdhuryDSP/BYOD/.plugin_settings.json";
 const String logFileSubDir = "ChowdhuryDSP/BYOD/Logs";
 const String logFileNameRoot = "BYOD_Log_";
 } // namespace
 
 BYOD::BYOD() : chowdsp::PluginBase<BYOD> (&undoManager),
-               logger ({ .logFileSubDir = logFileSubDir,
-                         .logFileNameRoot = logFileNameRoot,
+               logger ({ .logFileSubDir = BYODPaths::logFileSubDir,
+                         .logFileNameRoot = BYODPaths::logFileNameRoot,
                          .crashLogAnalysisCallback = [this] (const File& logFile)
                          { crashLogFile.emplace (logFile); } }),
                procStore (&undoManager)
@@ -23,7 +23,7 @@ BYOD::BYOD() : chowdsp::PluginBase<BYOD> (&undoManager),
 
     Logger::writeToLog (chowdsp::PluginDiagnosticInfo::getDiagnosticsString (*this));
 
-    pluginSettings->initialise (settingsFilePath);
+    pluginSettings->initialise (BYODPaths::settingsFilePath);
     procs = std::make_unique<ProcessorChain> (procStore, vts, presetManager, paramForwarder, [&] (int l)
                                               { updateSampleLatency (l); });
     paramForwarder = std::make_unique<ParamForwardManager> (vts, *procs);

diff --git a/src/gui/pedalboard/BoardComponent.cpp b/src/gui/pedalboard/BoardComponent.cpp
@@ -2,7 +2,7 @@
 #include "cables/CableViewConnectionHelper.h"
 #include "processors/chain/ProcessorChainActionHelper.h"
 
-namespace
+namespace BoardDims
 {
 constexpr int editorWidth = 270;
 constexpr int editorHeight = 180;
@@ -108,20 +108,20 @@ void BoardComponent::resized()
     const auto width = getWidth();
     const auto height = getHeight();
 
-    const auto thisEditorWidth = getScaleDim (editorWidth, scaleFactor);
-    const auto thisEditorHeight = getScaleDim (editorHeight, scaleFactor);
+    const auto thisEditorWidth = BoardDims::getScaleDim (BoardDims::editorWidth, scaleFactor);
+    const auto thisEditorHeight = BoardDims::getScaleDim (BoardDims::editorHeight, scaleFactor);
     auto centreEditorHeight = (height - thisEditorHeight) / 2;
 
-    setEditorPosition (inputEditor.get(), Rectangle (editorPad, centreEditorHeight, thisEditorWidth / 2, thisEditorHeight));
-    setEditorPosition (outputEditor.get(), Rectangle (width - (thisEditorWidth / 2 + editorPad), centreEditorHeight, thisEditorWidth / 2, thisEditorHeight));
+    setEditorPosition (inputEditor.get(), Rectangle (BoardDims::editorPad, centreEditorHeight, thisEditorWidth / 2, thisEditorHeight));
+    setEditorPosition (outputEditor.get(), Rectangle (width - (thisEditorWidth / 2 + BoardDims::editorPad), centreEditorHeight, thisEditorWidth / 2, thisEditorHeight));
 
     for (auto* editor : processorEditors)
         setEditorPosition (editor);
 
     cableView.setBounds (getLocalBounds());
     cableView.updateCablePositions();
 
-    newProcButton.setBounds (width - newButtonWidth, 0, newButtonWidth, newButtonWidth);
+    newProcButton.setBounds (width - BoardDims::newButtonWidth, 0, BoardDims::newButtonWidth, BoardDims::newButtonWidth);
     infoComp.setBounds (Rectangle<int> (jmin (400, width), jmin (250, height)).withCentre (getLocalBounds().getCentre()));
 
     repaint();
@@ -252,14 +252,14 @@ void BoardComponent::showNewProcMenu (PopupMenu& menu, PopupMenu::Options& optio
 {
     if (addingFromNewProcButton)
     {
-        nextEditorPosition = getRandomPosition (*this);
+        nextEditorPosition = BoardDims::getRandomPosition (*this);
     }
     else
     {
         nextEditorPosition = mousePos;
 
-        const auto halfEditorWidth = getScaleDim (editorWidth, scaleFactor) / 2;
-        const auto halfEditorHeight = getScaleDim (editorHeight, scaleFactor) / 2;
+        const auto halfEditorWidth = BoardDims::getScaleDim (BoardDims::editorWidth, scaleFactor) / 2;
+        const auto halfEditorHeight = BoardDims::getScaleDim (BoardDims::editorHeight, scaleFactor) / 2;
         nextEditorPosition.x = jlimit (halfEditorWidth, getWidth() - halfEditorWidth, nextEditorPosition.x);
         nextEditorPosition.y = jlimit (halfEditorHeight, getHeight() - halfEditorHeight, nextEditorPosition.y);
     }
@@ -301,8 +301,8 @@ ProcessorEditor* BoardComponent::findEditorForProcessor (const BaseProcessor* pr
 
 void BoardComponent::setEditorPosition (ProcessorEditor* editor, Rectangle<int> bounds)
 {
-    const auto thisEditorWidth = getScaleDim (editorWidth, scaleFactor);
-    const auto thisEditorHeight = getScaleDim (editorHeight, scaleFactor);
+    const auto thisEditorWidth = BoardDims::getScaleDim (BoardDims::editorWidth, scaleFactor);
+    const auto thisEditorHeight = BoardDims::getScaleDim (BoardDims::editorHeight, scaleFactor);
 
     auto* proc = editor->getProcPtr();
     auto position = proc->getPosition (getBounds());

diff --git a/src/gui/pedalboard/BoardViewport.cpp b/src/gui/pedalboard/BoardViewport.cpp
@@ -1,6 +1,6 @@
 #include "BoardViewport.h"
 
-namespace
+namespace ViewportTags
 {
 const juce::Identifier zoomLevelTag { "zoom_level" };
 }
@@ -13,9 +13,9 @@ BoardViewport::BoardViewport (AudioProcessorValueTreeState& vts,
     pluginSettings->addProperties<&BoardViewport::globalSettingChanged> ({ { defaultZoomSettingID, 1.0 },
                                                                            { portTooltipsSettingID, true } },
                                                                          *this);
-    if (! vts.state.hasProperty (zoomLevelTag))
-        vts.state.setProperty (zoomLevelTag, pluginSettings->getProperty<double> (defaultZoomSettingID), nullptr);
-    scaleFactor = vts.state.getPropertyAsValue (zoomLevelTag, nullptr, true);
+    if (! vts.state.hasProperty (ViewportTags::zoomLevelTag))
+        vts.state.setProperty (ViewportTags::zoomLevelTag, pluginSettings->getProperty<double> (defaultZoomSettingID), nullptr);
+    scaleFactor = vts.state.getPropertyAsValue (ViewportTags::zoomLevelTag, nullptr, true);
     setScaleFactor ((float) scaleFactor.getValue());
 
     toggleTooltips (pluginSettings->getProperty<bool> (portTooltipsSettingID));

diff --git a/src/gui/pedalboard/cables/CableViewConnectionHelper.cpp b/src/gui/pedalboard/cables/CableViewConnectionHelper.cpp
@@ -3,7 +3,7 @@
 #include "CableViewPortLocationHelper.h"
 #include "processors/chain/ProcessorChainActionHelper.h"
 
-namespace
+namespace CableConnectionMethods
 {
 void updateConnectionStatuses (const BoardComponent& board, const ConnectionInfo& connection, bool isConnected)
 {
@@ -42,7 +42,7 @@ CableViewConnectionHelper::CableViewConnectionHelper (CableView& cv, BoardCompon
 void CableViewConnectionHelper::processorBeingAdded (BaseProcessor* newProc)
 {
     ScopedLock sl (cableView.cableMutex);
-    addConnectionsForProcessor (cables, newProc, board, cableView);
+    CableConnectionMethods::addConnectionsForProcessor (cables, newProc, board, cableView);
 }
 
 void CableViewConnectionHelper::processorBeingRemoved (const BaseProcessor* proc)
@@ -51,7 +51,7 @@ void CableViewConnectionHelper::processorBeingRemoved (const BaseProcessor* proc
     {
         if (cables[i]->connectionInfo.startProc == proc || cables[i]->connectionInfo.endProc == proc)
         {
-            updateConnectionStatuses (board, cables[i]->connectionInfo, false);
+            CableConnectionMethods::updateConnectionStatuses (board, cables[i]->connectionInfo, false);
             ScopedLock sl (cableView.cableMutex);
             cables.remove (i);
         }
@@ -77,8 +77,8 @@ void CableViewConnectionHelper::refreshConnections()
     }
 
     for (auto* proc : board.procChain.getProcessors())
-        addConnectionsForProcessor (cables, proc, board, cableView);
-    addConnectionsForProcessor (cables, &board.procChain.getInputProcessor(), board, cableView);
+        CableConnectionMethods::addConnectionsForProcessor (cables, proc, board, cableView);
+    CableConnectionMethods::addConnectionsForProcessor (cables, &board.procChain.getInputProcessor(), board, cableView);
 
     for (auto* cable : cables)
     {
@@ -90,7 +90,7 @@ void CableViewConnectionHelper::refreshConnections()
 
 void CableViewConnectionHelper::connectionAdded (const ConnectionInfo& info)
 {
-    updateConnectionStatuses (board, info, true);
+    CableConnectionMethods::updateConnectionStatuses (board, info, true);
 
     if (ignoreConnectionCallbacks)
         return;
@@ -102,7 +102,7 @@ void CableViewConnectionHelper::connectionAdded (const ConnectionInfo& info)
 
 void CableViewConnectionHelper::connectionRemoved (const ConnectionInfo& info)
 {
-    updateConnectionStatuses (board, info, false);
+    CableConnectionMethods::updateConnectionStatuses (board, info, false);
 
     if (ignoreConnectionCallbacks)
         return;

diff --git a/src/gui/pedalboard/cables/CableViewPortLocationHelper.cpp b/src/gui/pedalboard/cables/CableViewPortLocationHelper.cpp
@@ -2,7 +2,7 @@
 #include "../BoardComponent.h"
 #include "CableDrawingHelpers.h"
 
-namespace
+namespace CableViewHelperMethods
 {
 bool wouldConnectingCreateFeedbackLoop (const BaseProcessor* sourceProc, const BaseProcessor* destProc, const OwnedArray<Cable>& cables)
 {
@@ -66,13 +66,13 @@ CableView::EditorPort CableViewPortLocationHelper::getNearestInputPort (const ju
 
     for (const auto* editor : board.processorEditors)
     {
-        if (wouldConnectingCreateFeedbackLoop (sourceProc, editor->getProcPtr(), cables))
+        if (CableViewHelperMethods::wouldConnectingCreateFeedbackLoop (sourceProc, editor->getProcPtr(), cables))
             continue; // no feedback loops allowed
 
-        getClosestPort (pos, editor, minDistance, result, true, cableView.scaleFactor);
+        CableViewHelperMethods::getClosestPort (pos, editor, minDistance, result, true, cableView.scaleFactor);
     }
 
-    getClosestPort (pos, board.outputEditor.get(), minDistance, result, true, cableView.scaleFactor);
+    CableViewHelperMethods::getClosestPort (pos, board.outputEditor.get(), minDistance, result, true, cableView.scaleFactor);
 
     if (result.editor == nullptr || isInputPortConnected (result))
         return {};
@@ -87,12 +87,12 @@ CableView::EditorPort CableViewPortLocationHelper::getNearestPort (const juce::P
 
     for (auto* editor : board.processorEditors)
     {
-        getClosestPort (pos, editor, minDistance, result, false, cableView.scaleFactor);
-        getClosestPort (pos, editor, minDistance, result, true, cableView.scaleFactor);
+        CableViewHelperMethods::getClosestPort (pos, editor, minDistance, result, false, cableView.scaleFactor);
+        CableViewHelperMethods::getClosestPort (pos, editor, minDistance, result, true, cableView.scaleFactor);
     }
 
-    getClosestPort (pos, board.inputEditor.get(), minDistance, result, false, cableView.scaleFactor);
-    getClosestPort (pos, board.outputEditor.get(), minDistance, result, true, cableView.scaleFactor);
+    CableViewHelperMethods::getClosestPort (pos, board.inputEditor.get(), minDistance, result, false, cableView.scaleFactor);
+    CableViewHelperMethods::getClosestPort (pos, board.outputEditor.get(), minDistance, result, true, cableView.scaleFactor);
 
     if (result.editor == nullptr)
         return {};

diff --git a/src/gui/pedalboard/editors/KnobsComponent.cpp b/src/gui/pedalboard/editors/KnobsComponent.cpp
@@ -2,7 +2,7 @@
 #include "gui/utils/LookAndFeels.h"
 #include "processors/BaseProcessor.h"
 
-namespace
+namespace KnobDims
 {
 constexpr float nameHeightScale = 0.115f;
 }
@@ -191,7 +191,7 @@ void KnobsComponent::paint (Graphics& g)
 {
     g.setColour (contrastColour.withAlpha (isEnabled() ? 1.0f : 0.6f));
 
-    const auto nameHeight = proportionOfHeight (nameHeightScale);
+    const auto nameHeight = proportionOfHeight (KnobDims::nameHeightScale);
     const auto nameOffset = proportionOfHeight (0.157f);
     auto makeName = [&g, nameHeight, nameOffset] (Component& comp, const String& name, int offset = 0)
     {
@@ -219,7 +219,7 @@ void KnobsComponent::resized()
 {
     int totalNumComponents = sliders.size() + boxes.size() + buttons.size() + customComponents.size();
 
-    const auto nameHeight = proportionOfHeight (nameHeightScale);
+    const auto nameHeight = proportionOfHeight (KnobDims::nameHeightScale);
     int compHeight = getHeight() - nameHeight;
     int compWidth = totalNumComponents > 1 ? (getWidth() - 10) / totalNumComponents : compHeight;
 

diff --git a/src/gui/pedalboard/editors/ProcessorEditor.cpp b/src/gui/pedalboard/editors/ProcessorEditor.cpp
@@ -3,7 +3,7 @@
 #include "processors/chain/ProcessorChainActionHelper.h"
 #include "processors/netlist_helpers/CircuitQuantity.h"
 
-namespace
+namespace EditorDims
 {
 constexpr float cornerSize = 5.0f;
 }
@@ -170,11 +170,11 @@ void ProcessorEditor::paint (Graphics& g)
                           (float) getWidth(),
                           false };
     g.setGradientFill (grad);
-    g.fillRoundedRectangle (getLocalBounds().toFloat(), cornerSize);
+    g.fillRoundedRectangle (getLocalBounds().toFloat(), EditorDims::cornerSize);
 
     if (procUI.backgroundImage != nullptr)
     {
-        auto backgroundBounds = getLocalBounds().reduced ((int) cornerSize);
+        auto backgroundBounds = getLocalBounds().reduced ((int) EditorDims::cornerSize);
         procUI.backgroundImage->drawWithin (g, backgroundBounds.toFloat(), RectanglePlacement::stretchToFit, 1.0f);
     }
 

diff --git a/src/gui/toolbar/SettingsButton.cpp b/src/gui/toolbar/SettingsButton.cpp
@@ -4,7 +4,7 @@
 #include "processors/chain/ProcessorChainPortMagnitudesHelper.h"
 #include "state/ParamForwardManager.h"
 
-namespace
+namespace SettingsColours
 {
 const Colour onColour = Colours::yellow;
 const Colour offColour = Colours::white;
@@ -101,7 +101,7 @@ void SettingsButton::defaultZoomMenu (PopupMenu& menu, int itemID)
         item.text = String (int (zoomLevel * 100.0)) + "%";
         item.action = [this, zoomLevel]
         { pluginSettings->setProperty (BoardViewport::defaultZoomSettingID, zoomLevel); };
-        item.colour = isWithin (zoomLevel, curDefaultZoomLevel, 0.001) ? onColour : offColour;
+        item.colour = isWithin (zoomLevel, curDefaultZoomLevel, 0.001) ? SettingsColours::onColour : SettingsColours::offColour;
 
         defaultZoomMenu.addItem (item);
     }
@@ -124,7 +124,7 @@ void SettingsButton::addPluginSettingMenuOption (const String& name, const Setti
     item.text = name;
     item.action = [this, id, isCurrentlyOn]
     { pluginSettings->setProperty (id, ! isCurrentlyOn); };
-    item.colour = isCurrentlyOn ? onColour : offColour;
+    item.colour = isCurrentlyOn ? SettingsColours::onColour : SettingsColours::offColour;
 
     menu.addItem (item);
 }
diff --git a/src/gui/toolbar/UndoRedoComponent.cpp b/src/gui/toolbar/UndoRedoComponent.cpp
@@ -1,6 +1,6 @@
 #include "UndoRedoComponent.h"
 
-namespace
+namespace UndoRedoDims
 {
 constexpr int buttonPad = 10;
 }
@@ -59,9 +59,9 @@ void UndoRedoComponent::resized()
         return rect.withHeight (rect.getWidth()).withCentre ({ rect.getCentreX(), b.getCentreY() });
     };
 
-    const auto undoBounds = bounds.removeFromLeft (baseWidth).withTrimmedLeft (buttonPad).withTrimmedRight (buttonPad / 2);
+    const auto undoBounds = bounds.removeFromLeft (baseWidth).withTrimmedLeft (UndoRedoDims::buttonPad).withTrimmedRight (UndoRedoDims::buttonPad / 2);
     undoButton.setBounds (makeSquareAndCentreY (undoBounds));
 
-    const auto redoBounds = bounds.removeFromLeft (baseWidth).withTrimmedRight (buttonPad).withTrimmedLeft (buttonPad / 2);
+    const auto redoBounds = bounds.removeFromLeft (baseWidth).withTrimmedRight (UndoRedoDims::buttonPad).withTrimmedLeft (UndoRedoDims::buttonPad / 2);
     redoButton.setBounds (makeSquareAndCentreY (redoBounds));
 }
diff --git a/src/gui/utils/LevelMeterComponent.cpp b/src/gui/utils/LevelMeterComponent.cpp
@@ -1,14 +1,14 @@
 #include "LevelMeterComponent.h"
 
-namespace
+namespace LevelMeterConstants
 {
 constexpr auto maxDB = 6.0f;
 constexpr auto minDB = -45.0f;
 constexpr auto dBRange = maxDB - minDB;
 } // namespace
 
 LevelMeterComponent::LevelMeterComponent (const LevelDataType& levelData) : rmsLevels (levelData),
-                                                                            dbLevels ({ minDB, minDB }),
+                                                                            dbLevels ({ LevelMeterConstants::minDB, LevelMeterConstants::minDB }),
                                                                             dbLevelsPrev ({ 0.0f, 0.0f })
 {
     constexpr int timerHz = 24;
@@ -42,7 +42,7 @@ void LevelMeterComponent::paint (Graphics& g)
 
     auto getYForDB = [height] (float dB)
     {
-        auto normLevel = jmin (jmax (dB - minDB, 0.0f) / dBRange, 1.0f);
+        auto normLevel = jmin (jmax (dB - LevelMeterConstants::minDB, 0.0f) / LevelMeterConstants::dBRange, 1.0f);
         return int ((1.0f - normLevel) * (float) height);
     };
 
@@ -62,7 +62,7 @@ void LevelMeterComponent::timerCallback()
     {
         dbLevels[ch] = Decibels::gainToDecibels (levelDetector[ch].processSample (rmsLevels[ch]));
 
-        if (std::abs (dbLevels[ch] - dbLevelsPrev[ch]) > 0.5f && dbLevels[ch] > minDB && dbLevelsPrev[ch] > minDB)
+        if (std::abs (dbLevels[ch] - dbLevelsPrev[ch]) > 0.5f && dbLevels[ch] > LevelMeterConstants::minDB && dbLevelsPrev[ch] > LevelMeterConstants::minDB)
         {
             dbLevelsPrev[ch] = dbLevels[ch];
             needsRepaint = true;

diff --git a/src/processors/chain/ProcessorChain.cpp b/src/processors/chain/ProcessorChain.cpp
@@ -4,7 +4,7 @@
 #include "ProcessorChainStateHelper.h"
 #include "processors/chain/ChainIOProcessor.h"
 
-namespace
+namespace ChainHelperFuncs
 {
 [[maybe_unused]] void printBufferLevels (const AudioBuffer<float>& buffer)
 {
@@ -199,7 +199,7 @@ void ProcessorChain::processAudio (AudioBuffer<float>& buffer, const MidiBuffer&
     }
 
     bool outProcessed = false;
-    const auto& processMidiBuffer = getMidiBufferToUse (hostMidiBuffer, internalMidiBuffer, ioProcessor.getOversamplingFactor());
+    const auto& processMidiBuffer = ChainHelperFuncs::getMidiBufferToUse (hostMidiBuffer, internalMidiBuffer, ioProcessor.getOversamplingFactor());
 
     for (auto* processor : procs)
     {