gearmulator

commit a48705bbc4118319eef20edb5245bb5f4dbe4c51
parent aecee505d8fb9a374d108b46289fc772acfab8af
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 15 May 2022 02:30:18 +0200

begin ParameterType enum removal

Diffstat:
M
source/jucePlugin/VirusController.cpp
 | 
8
--------
M
source/jucePlugin/VirusController.h
 | 
1
-
M
source/jucePlugin/VirusParameterBinding.cpp
 | 
10
+++++-----
M
source/jucePlugin/VirusParameterBinding.h
 | 
12
++++++------
M
source/jucePlugin/ui3/VirusEditor.cpp
 | 
8
++++----

5 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/source/jucePlugin/VirusController.cpp b/source/jucePlugin/VirusController.cpp
@@ -402,14 +402,6 @@ namespace Virus
 		LOG((ss.str()));
     }
 
-    ParameterType Controller::getParameterTypeByName(const std::string& _name) const
-    {
-        const auto i = getParameterIndexByName(_name);
-        if(i == InvalidParameterIndex)
-            return Param_Invalid;
-        return static_cast<ParameterType>(i);
-    }
-
     void Controller::sendSysEx(const SysEx &msg) const
     {
         synthLib::SMidiEvent ev;
diff --git a/source/jucePlugin/VirusController.h b/source/jucePlugin/VirusController.h
@@ -51,7 +51,6 @@ namespace Virus
 
         static void printMessage(const SysEx &);
 
-        ParameterType getParameterTypeByName(const std::string& _name) const;
         juce::Value* getParamValue(uint8_t ch, uint8_t bank, uint8_t paramIndex);
 
 		virusLib::VirusModel getVirusModel() const;
diff --git a/source/jucePlugin/VirusParameterBinding.cpp b/source/jucePlugin/VirusParameterBinding.cpp
@@ -68,11 +68,11 @@ void VirusParameterBinding::setPart(uint8_t _part)
 		assert(false && "unknown component type");
 	}
 }
-void VirusParameterBinding::bind(juce::Slider &_slider, Virus::ParameterType _param)
+void VirusParameterBinding::bind(juce::Slider &_slider, uint32_t _param)
 {
 	bind(_slider, _param, CurrentPart);
 }
-void VirusParameterBinding::bind(juce::Slider &_slider, Virus::ParameterType _param, const uint8_t _part)
+void VirusParameterBinding::bind(juce::Slider &_slider, uint32_t _param, const uint8_t _part)
 {
 	const auto v = dynamic_cast<Virus::Parameter*>(m_processor.getController().getParameter(_param, _part == CurrentPart ? m_processor.getController().getCurrentPart() : _part));
 
@@ -101,12 +101,12 @@ void VirusParameterBinding::bind(juce::Slider &_slider, Virus::ParameterType _pa
 	m_bindings.emplace_back(p);
 }
 
-void VirusParameterBinding::bind(juce::ComboBox& _combo, Virus::ParameterType _param)
+void VirusParameterBinding::bind(juce::ComboBox& _combo, uint32_t _param)
 {
 	bind(_combo, _param, CurrentPart);
 }
 
-void VirusParameterBinding::bind(juce::ComboBox& _combo, const Virus::ParameterType _param, uint8_t _part)
+void VirusParameterBinding::bind(juce::ComboBox& _combo, const uint32_t _param, uint8_t _part)
 {
 	const auto v = dynamic_cast<Virus::Parameter*>(m_processor.getController().getParameter(_param, _part == CurrentPart ? m_processor.getController().getCurrentPart() : _part));
 	if (!v)
@@ -150,7 +150,7 @@ void VirusParameterBinding::bind(juce::ComboBox& _combo, const Virus::ParameterT
 	m_bindings.emplace_back(p);
 }
 
-void VirusParameterBinding::bind(juce::Button &_btn, const Virus::ParameterType _param)
+void VirusParameterBinding::bind(juce::Button &_btn, const uint32_t _param)
 {
 	const auto v = dynamic_cast<Virus::Parameter*>(m_processor.getController().getParameter(_param, m_processor.getController().getCurrentPart()));
 	if (!v)
diff --git a/source/jucePlugin/VirusParameterBinding.h b/source/jucePlugin/VirusParameterBinding.h
@@ -31,11 +31,11 @@ public:
 	~VirusParameterBinding() override;
 	void clearBindings();
 	void setPart(uint8_t _part);
-	void bind(juce::Slider& _control, Virus::ParameterType _param);
-	void bind(juce::Slider& _control, Virus::ParameterType _param, uint8_t _part);
-	void bind(juce::ComboBox &_control, Virus::ParameterType _param);
-	void bind(juce::ComboBox &_control, Virus::ParameterType _param, uint8_t _part);
-	void bind(juce::Button &_control, Virus::ParameterType _param);
+	void bind(juce::Slider& _control, uint32_t _param);
+	void bind(juce::Slider& _control, uint32_t _param, uint8_t _part);
+	void bind(juce::ComboBox &_control, uint32_t _param);
+	void bind(juce::ComboBox &_control, uint32_t _param, uint8_t _part);
+	void bind(juce::Button &_control, uint32_t _param);
 
 private:
 	void removeMouseListener(juce::Slider& _slider);
@@ -48,7 +48,7 @@ private:
 	{
 		Virus::Parameter* parameter = nullptr;
 		juce::Component* component = nullptr;
-		Virus::ParameterType type = Virus::Param_Invalid;
+		uint32_t type = 0xffffffff;
 		uint8_t part = CurrentPart;
 	};
 
diff --git a/source/jucePlugin/ui3/VirusEditor.cpp b/source/jucePlugin/ui3/VirusEditor.cpp
@@ -214,24 +214,24 @@ namespace genericVirusUI
 
 	int VirusEditor::getParameterIndexByName(const std::string& _name)
 	{
-		return getController().getParameterTypeByName(_name);
+		return getController().getParameterIndexByName(_name);
 	}
 
 	bool VirusEditor::bindParameter(juce::Button& _target, int _parameterIndex)
 	{
-		m_parameterBinding.bind(_target, static_cast<Virus::ParameterType>(_parameterIndex));
+		m_parameterBinding.bind(_target, _parameterIndex);
 		return true;
 	}
 
 	bool VirusEditor::bindParameter(juce::ComboBox& _target, int _parameterIndex)
 	{
-		m_parameterBinding.bind(_target, static_cast<Virus::ParameterType>(_parameterIndex));
+		m_parameterBinding.bind(_target, _parameterIndex);
 		return true;
 	}
 
 	bool VirusEditor::bindParameter(juce::Slider& _target, int _parameterIndex)
 	{
-		m_parameterBinding.bind(_target, static_cast<Virus::ParameterType>(_parameterIndex));
+		m_parameterBinding.bind(_target, _parameterIndex);
 		return true;
 	}