commit 9ba273ab0851796945ca01ade72e4f2a3b23ddee
parent 624e3c9283f416981039125bfa18e10e7d6743e4
Author: trancy2k5 <63122430+trancy2k5@users.noreply.github.com>
Date: Sun, 23 Jan 2022 14:24:02 +0100
And another fix
Removed unused code
Diffstat:
2 files changed, 4 insertions(+), 134 deletions(-)
diff --git a/source/jucePlugin/ui2/Virus_Panel4_ArpEditor.cpp b/source/jucePlugin/ui2/Virus_Panel4_ArpEditor.cpp
@@ -374,135 +374,4 @@ void ArpEditor::updateMidiOutput(int index)
m_cmbMidiOutput.setSelectedItemIndex(index + 1, juce::dontSendNotification);
m_lastOutputIndex = index;
-}
-
-
-#if NULL
-ArpEditor::VelocityAmount::VelocityAmount(VirusParameterBinding &_parameterBinding)
-{
- constexpr auto y = 19;
- for (auto *s : {&m_osc1Shape, &m_filter1Freq, &m_filter1Res, &m_pulseWidth, &m_volume, &m_panorama, &m_osc2Shape,
- &m_filter2Freq, &m_filter2Res, &m_fmAmount})
- setupRotary(*this, *s);
- m_osc1Shape.setBounds(31, y, knobSize, knobSize);
- m_filter1Freq.setBounds(m_osc1Shape.getRight() - 7, y, knobSize, knobSize);
- m_filter1Res.setBounds(m_filter1Freq.getRight() - 8, y, knobSize, knobSize);
- m_pulseWidth.setBounds(m_filter1Res.getRight() - 7, y, knobSize, knobSize);
- m_volume.setBounds(m_pulseWidth.getRight() - 3, y, knobSize, knobSize);
- m_panorama.setBounds(m_volume.getRight() - 9, y, knobSize, knobSize);
-
- const auto y2 = m_osc1Shape.getBottom() + y;
- m_osc2Shape.setBounds(31, y2, knobSize, knobSize);
- m_filter2Freq.setBounds(m_osc1Shape.getRight() - 7, y2, knobSize, knobSize);
- m_filter2Res.setBounds(m_filter1Freq.getRight() - 8, y2, knobSize, knobSize);
- m_fmAmount.setBounds(m_filter1Res.getRight() - 7, y2, knobSize, knobSize);
-
- _parameterBinding.bind(m_osc1Shape, Virus::Param_Osc1ShapeVelocity);
- _parameterBinding.bind(m_filter1Freq, Virus::Param_Filter1EnvAmtVelocity);
- _parameterBinding.bind(m_filter1Res, Virus::Param_Resonance1Velocity);
- _parameterBinding.bind(m_pulseWidth, Virus::Param_PulseWidthVelocity);
- _parameterBinding.bind(m_volume, Virus::Param_AmpVelocity);
- _parameterBinding.bind(m_panorama, Virus::Param_PanoramaVelocity);
- _parameterBinding.bind(m_osc2Shape, Virus::Param_Osc2ShapeVelocity);
- _parameterBinding.bind(m_filter2Freq, Virus::Param_Filter2EnvAmtVelocity);
- _parameterBinding.bind(m_filter2Res, Virus::Param_Resonance2Velocity);
- _parameterBinding.bind(m_fmAmount, Virus::Param_FmAmountVelocity);
-}
-
-ArpEditor::Inputs::Inputs(VirusParameterBinding &_parameterBinding)
-{
- addAndMakeVisible(m_inputMode);
- m_inputMode.setBounds(43, 38, comboBoxWidth, comboBoxHeight);
- addAndMakeVisible(m_inputSelect);
- m_inputSelect.setBounds(145, 38, comboBoxWidth, comboBoxHeight);
-
- _parameterBinding.bind(m_inputMode, Virus::Param_InputMode);
- _parameterBinding.bind(m_inputSelect, Virus::Param_InputSelect);
-}
-
-ArpEditor::Arpeggiator::Arpeggiator(VirusParameterBinding &_parameterBinding)
-{
- constexpr auto y = 18;
- for (auto *s : {&m_globalTempo, &m_noteLength, &m_noteSwing})
- setupRotary(*this, *s);
- m_globalTempo.setBounds(341, y, knobSize, knobSize);
- m_noteLength.setBounds(m_globalTempo.getRight() - 8, y, knobSize, knobSize);
- m_noteSwing.setBounds(m_noteLength.getRight() - 7, y, knobSize, knobSize);
-
- for (auto *c : {&m_mode, &m_pattern, &m_octaveRange, &m_resolution})
- addAndMakeVisible(c);
-
- constexpr auto comboBoxWidth = 90;
- constexpr auto comboBoxHeight = 15;
- constexpr auto comboTopY = 35;
-
- m_mode.setBounds(35, 40, 100, 18);
- m_pattern.setBounds(114, comboTopY, comboBoxWidth, comboBoxHeight);
- m_resolution.setBounds(220, comboTopY, comboBoxWidth, comboBoxHeight);
- m_octaveRange.setBounds(m_pattern.getBounds().translated(0, comboBoxHeight + 18));
-
- addAndMakeVisible(m_arpHold);
- m_arpHold.setBounds(222, m_octaveRange.getY()+2, 28, 11);
-
- _parameterBinding.bind(m_globalTempo, Virus::Param_ClockTempo);
- _parameterBinding.bind(m_noteLength, Virus::Param_ArpNoteLength);
- _parameterBinding.bind(m_noteSwing, Virus::Param_ArpSwing);
- _parameterBinding.bind(m_mode, Virus::Param_ArpMode);
- _parameterBinding.bind(m_pattern, Virus::Param_ArpPatternSelect);
- _parameterBinding.bind(m_octaveRange, Virus::Param_ArpOctaveRange);
- _parameterBinding.bind(m_resolution, Virus::Param_ArpClock);
- _parameterBinding.bind(m_arpHold, Virus::Param_ArpHoldEnable);
-}
-
-ArpEditor::SoftKnobs::SoftKnobs(VirusParameterBinding &_parameterBinding)
-{
- auto distance = 105;
- for (auto i = 0; i < 2; i++)
- {
- addAndMakeVisible(m_funcAs[i]);
- m_funcAs[i].setBounds(i == 0 ? 18 : 338, 42, comboBoxWidth, comboBoxHeight);
- addAndMakeVisible(m_name[i]);
- m_name[i].setBounds(m_funcAs[i].getX() + distance, 42, comboBoxWidth, comboBoxHeight);
- }
-}
-
-ArpEditor::PatchSettings::PatchSettings(VirusParameterBinding &_parameterBinding)
-{
- constexpr auto y = 18;
- for (auto *s : {&m_patchVolume, &m_panning, &m_outputBalance, &m_transpose})
- setupRotary(*this, *s);
- m_patchVolume.setBounds(101, y, knobSize, knobSize);
- m_panning.setBounds(m_patchVolume.getRight() - 9, y, knobSize, knobSize);
- const auto y2 = m_patchVolume.getBottom() + 9;
- m_outputBalance.setBounds(m_patchVolume.getX(), y2, knobSize, knobSize);
- m_transpose.setBounds(m_panning.getX(), y2, knobSize, knobSize);
-
- for (auto *cb :
- {&m_keyMode, &m_secondaryOutput, &m_bendUp, &m_bendDown, &m_bendScale, &m_smoothMode, &m_cat1, &m_cat2})
- addAndMakeVisible(cb);
-
-
- constexpr auto yDist = 50;
- m_keyMode.setBounds(18, 42, comboBoxWidth, comboBoxHeight);
- m_secondaryOutput.setBounds(18, 122, comboBoxWidth, comboBoxHeight);
- constexpr auto x1 = 338;
- constexpr auto x2 = 444;
- m_bendUp.setBounds(x1, 42, comboBoxWidth, comboBoxHeight);
- m_bendScale.setBounds(x1, 42 + yDist, comboBoxWidth, comboBoxHeight);
- m_cat1.setBounds(x1, m_bendScale.getY() + yDist - 1, comboBoxWidth, comboBoxHeight);
- m_bendDown.setBounds(x2, 42, comboBoxWidth, comboBoxHeight);
- m_smoothMode.setBounds(x2, m_bendScale.getY(), comboBoxWidth, comboBoxHeight);
- m_cat2.setBounds(x2, m_cat1.getY(), comboBoxWidth, comboBoxHeight);
-
- _parameterBinding.bind(m_patchVolume, Virus::Param_PatchVolume);
- _parameterBinding.bind(m_panning, Virus::Param_Panorama);
- //_parameterBinding.bind(m_outputBalance, Virus::Param_SecondOutputBalance);
- _parameterBinding.bind(m_transpose, Virus::Param_Transpose);
- _parameterBinding.bind(m_keyMode, Virus::Param_KeyMode);
- //_parameterBinding.bind(m_secondaryOutput, Virus::Param_KeyMode);
- _parameterBinding.bind(m_bendUp, Virus::Param_BenderRangeUp);
- _parameterBinding.bind(m_bendDown, Virus::Param_BenderRangeDown);
- _parameterBinding.bind(m_bendScale, Virus::Param_BenderScale);
- _parameterBinding.bind(m_smoothMode, Virus::Param_ControlSmoothMode);
-}
-#endif
-\ No newline at end of file
+}
+\ No newline at end of file
diff --git a/source/jucePlugin/ui2/Virus_Panel4_ArpEditor.h b/source/jucePlugin/ui2/Virus_Panel4_ArpEditor.h
@@ -12,7 +12,8 @@ class ArpEditor : public juce::Component
{
public:
ArpEditor(VirusParameterBinding &_parameterBinding, AudioPluginAudioProcessor &_processorRef);
- ArpEditor::~ArpEditor() override;
+ ~ArpEditor() override;
+
static constexpr auto kPartGroupId = 0x3FBBC;
void refreshParts();
private:
