Skip to content

Commit

Permalink
Add a field for specifying LabelSlider label text on construction
Browse files Browse the repository at this point in the history
I've snuck in a change to our slider label text casing as well.
I had to, of course, directly enter the label text with this change
so as not to break the commit. Why put text I am about to change?

I could have defined an overload to prevent an interface break
but it all seemed like a fuss. Even this comment is a bit much.
  • Loading branch information
JoseDiazRohena committed Aug 1, 2023
1 parent 9619877 commit 245afbf
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 11 deletions.
5 changes: 3 additions & 2 deletions libs/tote_bag/juce_gui/components/widgets/LabelSlider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@

//==============================================================================

LabelSlider::LabelSlider (const juce::String& parameterId,
LabelSlider::LabelSlider (const juce::String& labelText,
const juce::String& parameterId,
juce::AudioProcessorValueTreeState& stateToControl)
: slider (parameterId, stateToControl)
{
label.setText (stateToControl.getParameter (parameterId)->name, juce::dontSendNotification);
label.setText (labelText, juce::dontSendNotification);
label.setColour (juce::Label::textColourId, juce::Colours::black);
label.setJustificationType (juce::Justification::centredTop);

Expand Down
3 changes: 2 additions & 1 deletion libs/tote_bag/juce_gui/components/widgets/LabelSlider.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ class AudioProcessorValueTreeState;
class LabelSlider : public juce::Component
{
public:
LabelSlider (const juce::String& parameterId,
LabelSlider (const juce::String& labelText,
const juce::String& parameterId,
juce::AudioProcessorValueTreeState& stateToControl);

~LabelSlider() override;
Expand Down
34 changes: 26 additions & 8 deletions src/gui/panels/ValentineCenterPanel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,42 @@ namespace detail
inline constexpr auto kButtonWidth = 108.1f;
inline constexpr auto kButtonHeight = 201.84f;
inline constexpr auto kButtonRatio = kButtonWidth / kButtonHeight;

inline const juce::String kInputSliderText = "COMPRESS";
inline const juce::String kCrushSliderText = "CRUSH";
inline const juce::String kSaturateSliderText = "SATURATE";
inline const juce::String kRatioSliderText = "RATIO";
inline const juce::String kAttackSliderText = "ATTACK";
inline const juce::String kReleaseSliderText = "RELEASE";
inline const juce::String kMixSliderText = "MIX";
inline const juce::String kOutputSliderText = "OUTPUT";

} // namespace detail

CenterPanel::CenterPanel (ValentineAudioProcessor& processor)
: inputSlider (FFCompParameterID()[getParameterIndex (VParameter::inputGain)],
: inputSlider (detail::kInputSliderText,
FFCompParameterID()[getParameterIndex (VParameter::inputGain)],
processor.treeState)
, crushSlider (FFCompParameterID()[getParameterIndex (VParameter::bitCrush)],
, crushSlider (detail::kCrushSliderText,
FFCompParameterID()[getParameterIndex (VParameter::bitCrush)],
processor.treeState)
, saturateSlider (FFCompParameterID()[getParameterIndex (VParameter::saturation)],
, saturateSlider (detail::kSaturateSliderText,
FFCompParameterID()[getParameterIndex (VParameter::saturation)],
processor.treeState)
, ratioSlider (FFCompParameterID()[getParameterIndex (VParameter::ratio)],
, ratioSlider (detail::kRatioSliderText,
FFCompParameterID()[getParameterIndex (VParameter::ratio)],
processor.treeState)
, attackSlider (FFCompParameterID()[getParameterIndex (VParameter::attack)],
, attackSlider (detail::kAttackSliderText,
FFCompParameterID()[getParameterIndex (VParameter::attack)],
processor.treeState)
, releaseSlider (FFCompParameterID()[getParameterIndex (VParameter::release)],
, releaseSlider (detail::kReleaseSliderText,
FFCompParameterID()[getParameterIndex (VParameter::release)],
processor.treeState)
, mixSlider (FFCompParameterID()[getParameterIndex (VParameter::dryWet)],
, mixSlider (detail::kMixSliderText,
FFCompParameterID()[getParameterIndex (VParameter::dryWet)],
processor.treeState)
, outputSlider (FFCompParameterID()[getParameterIndex (VParameter::makeupGain)],
, outputSlider (detail::kOutputSliderText,
FFCompParameterID()[getParameterIndex (VParameter::makeupGain)],
processor.treeState)
// clang-format off
, outputClipButton (
Expand Down

0 comments on commit 245afbf

Please sign in to comment.