commit f962aa02d86de81f2ad84a772b24727c2148d64c
parent 324d1f808f192e08abebfbd4372533ed04f12867
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date: Wed, 30 Oct 2024 22:25:01 +0100
move skin class to a separate file
Diffstat:
14 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -15,6 +15,7 @@ add_custom_target(cmakeScripts SOURCES
macsetup.command.in
runAuValidation.cmake
skins.cmake
+ skins.h.in
../base.cmake)
# ----------------- DSP56300 emulator
diff --git a/source/jucePluginEditorLib/CMakeLists.txt b/source/jucePluginEditorLib/CMakeLists.txt
@@ -15,6 +15,7 @@ set(SOURCES
pluginEditorWindow.cpp pluginEditorWindow.h
pluginEditorState.cpp pluginEditorState.h
pluginProcessor.cpp pluginProcessor.h
+ skin.h
types.h
)
diff --git a/source/jucePluginEditorLib/pluginEditorState.cpp b/source/jucePluginEditorLib/pluginEditorState.cpp
@@ -29,7 +29,7 @@ int PluginEditorState::getHeight() const
return m_editor ? m_editor->getHeight() : 0;
}
-const std::vector<PluginEditorState::Skin>& PluginEditorState::getIncludedSkins()
+const std::vector<Skin>& PluginEditorState::getIncludedSkins()
{
return m_includedSkins;
}
@@ -454,7 +454,7 @@ void PluginEditorState::exportCurrentSkin() const
}
}
-PluginEditorState::Skin PluginEditorState::readSkinFromConfig() const
+Skin PluginEditorState::readSkinFromConfig() const
{
const auto& config = m_processor.getConfig();
diff --git a/source/jucePluginEditorLib/pluginEditorState.h b/source/jucePluginEditorLib/pluginEditorState.h
@@ -5,6 +5,8 @@
#include <string>
#include <vector>
+#include "skin.h"
+
#include "jucePluginLib/parameterbinding.h"
namespace juce
@@ -20,18 +22,6 @@ namespace jucePluginEditorLib
class PluginEditorState
{
public:
- struct Skin
- {
- std::string displayName;
- std::string jsonFilename;
- std::string folder;
-
- bool operator == (const Skin& _other) const
- {
- return displayName == _other.displayName && jsonFilename == _other.jsonFilename && folder == _other.folder;
- }
- };
-
explicit PluginEditorState(Processor& _processor, pluginLib::Controller& _controller, std::vector<Skin> _includedSkins);
virtual ~PluginEditorState() = default;
diff --git a/source/jucePluginEditorLib/skin.h b/source/jucePluginEditorLib/skin.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <string>
+
+namespace jucePluginEditorLib
+{
+ struct Skin
+ {
+ std::string displayName;
+ std::string jsonFilename;
+ std::string folder;
+
+ bool operator == (const Skin& _other) const
+ {
+ return displayName == _other.displayName && jsonFilename == _other.jsonFilename && folder == _other.folder;
+ }
+ };
+}
diff --git a/source/mqJucePlugin/PluginEditorState.cpp b/source/mqJucePlugin/PluginEditorState.cpp
@@ -66,7 +66,7 @@ namespace mqJucePlugin
return true;
}
- jucePluginEditorLib::Editor* PluginEditorState::createEditor(const Skin& _skin)
+ jucePluginEditorLib::Editor* PluginEditorState::createEditor(const jucePluginEditorLib::Skin& _skin)
{
return new mqJucePlugin::Editor(m_processor, m_parameterBinding, _skin.folder, _skin.jsonFilename);
}
diff --git a/source/mqJucePlugin/PluginEditorState.h b/source/mqJucePlugin/PluginEditorState.h
@@ -18,6 +18,6 @@ namespace mqJucePlugin
void initContextMenu(juce::PopupMenu& _menu) override;
bool initAdvancedContextMenu(juce::PopupMenu& _menu, bool _enabled) override;
private:
- jucePluginEditorLib::Editor* createEditor(const Skin& _skin) override;
+ jucePluginEditorLib::Editor* createEditor(const jucePluginEditorLib::Skin& _skin) override;
};
}
\ No newline at end of file
diff --git a/source/nord/n2x/n2xJucePlugin/n2xPluginEditorState.cpp b/source/nord/n2x/n2xJucePlugin/n2xPluginEditorState.cpp
@@ -40,7 +40,7 @@ namespace n2xJucePlugin
return jucePluginEditorLib::PluginEditorState::initAdvancedContextMenu(_menu, _enabled);
}
- jucePluginEditorLib::Editor* PluginEditorState::createEditor(const Skin& _skin)
+ jucePluginEditorLib::Editor* PluginEditorState::createEditor(const jucePluginEditorLib::Skin& _skin)
{
return new n2xJucePlugin::Editor(m_processor, m_parameterBinding, _skin.folder, _skin.jsonFilename);
}
diff --git a/source/nord/n2x/n2xJucePlugin/n2xPluginEditorState.h b/source/nord/n2x/n2xJucePlugin/n2xPluginEditorState.h
@@ -18,6 +18,6 @@ namespace n2xJucePlugin
void initContextMenu(juce::PopupMenu& _menu) override;
bool initAdvancedContextMenu(juce::PopupMenu& _menu, bool _enabled) override;
private:
- jucePluginEditorLib::Editor* createEditor(const Skin& _skin) override;
+ jucePluginEditorLib::Editor* createEditor(const jucePluginEditorLib::Skin& _skin) override;
};
}
diff --git a/source/skins.h.in b/source/skins.h.in
@@ -1,6 +1,6 @@
#pragma once
-const std::vector<jucePluginEditorLib::PluginEditorState::Skin> g_includedSkins =
+const std::vector<jucePluginEditorLib::Skin> g_includedSkins =
{
${SKIN_CPP_ENTRIES}
};
diff --git a/source/virusJucePlugin/VirusEditorState.cpp b/source/virusJucePlugin/VirusEditorState.cpp
@@ -8,13 +8,13 @@
namespace virus
{
- VirusEditorState::VirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller, const std::vector<VirusEditorState::Skin>& _includedSkins)
+ VirusEditorState::VirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller, const std::vector<jucePluginEditorLib::Skin>& _includedSkins)
: jucePluginEditorLib::PluginEditorState(_processor, _controller, _includedSkins)
{
loadDefaultSkin();
}
- jucePluginEditorLib::Editor* VirusEditorState::createEditor(const Skin& _skin)
+ jucePluginEditorLib::Editor* VirusEditorState::createEditor(const jucePluginEditorLib::Skin& _skin)
{
return new genericVirusUI::VirusEditor(m_parameterBinding, static_cast<VirusProcessor&>(m_processor), _skin.jsonFilename, _skin.folder);
}
diff --git a/source/virusJucePlugin/VirusEditorState.h b/source/virusJucePlugin/VirusEditorState.h
@@ -9,9 +9,9 @@ namespace virus
class VirusEditorState : public jucePluginEditorLib::PluginEditorState
{
public:
- explicit VirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller, const std::vector<VirusEditorState::Skin>& _includedSkins);
+ explicit VirusEditorState(VirusProcessor& _processor, pluginLib::Controller& _controller, const std::vector<jucePluginEditorLib::Skin>& _includedSkins);
- jucePluginEditorLib::Editor* createEditor(const Skin& _skin) override;
+ jucePluginEditorLib::Editor* createEditor(const jucePluginEditorLib::Skin& _skin) override;
void initContextMenu(juce::PopupMenu& _menu) override;
bool initAdvancedContextMenu(juce::PopupMenu& _menu, bool _enabled) override;
diff --git a/source/xtJucePlugin/PluginEditorState.cpp b/source/xtJucePlugin/PluginEditorState.cpp
@@ -63,7 +63,7 @@ namespace xtJucePlugin
}
- jucePluginEditorLib::Editor* PluginEditorState::createEditor(const Skin& _skin)
+ jucePluginEditorLib::Editor* PluginEditorState::createEditor(const jucePluginEditorLib::Skin& _skin)
{
return new xtJucePlugin::Editor(m_processor, m_parameterBinding, _skin.folder, _skin.jsonFilename);
}
diff --git a/source/xtJucePlugin/PluginEditorState.h b/source/xtJucePlugin/PluginEditorState.h
@@ -18,6 +18,6 @@ namespace xtJucePlugin
void initContextMenu(juce::PopupMenu& _menu) override;
bool initAdvancedContextMenu(juce::PopupMenu& _menu, bool _enabled) override;
private:
- jucePluginEditorLib::Editor* createEditor(const Skin& _skin) override;
+ jucePluginEditorLib::Editor* createEditor(const jucePluginEditorLib::Skin& _skin) override;
};
}
