Skip to content

Commit

Permalink
well it compiles. does't work but its a start
Browse files Browse the repository at this point in the history
  • Loading branch information
@shih1
shih1 committed Dec 17, 2024
1 parent 8912c90 commit e4d4adb
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
63 changes: 32 additions & 31 deletions src/surge-fx/SurgeFXEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,27 +134,28 @@ SurgefxAudioProcessorEditor::SurgefxAudioProcessorEditor(SurgefxAudioProcessor &

for (int i = 0; i < n_fx_params; ++i)
{
fxParamSliders[i].setRange(0.0, 1.0, 0.0001);
fxParamSliders[i].setValue(processor.getFXStorageValue01(i),
juce::NotificationType::dontSendNotification);
fxParamSliders[i].setSliderStyle(juce::Slider::SliderStyle::RotaryHorizontalVerticalDrag);
fxParamSliders[i].setTextBoxStyle(juce::Slider::TextEntryBoxPosition::NoTextBox, true, 0,
0);
fxParamSliders[i].setChangeNotificationOnlyOnRelease(false);
fxParamSliders[i].setEnabled(processor.getParamEnabled(i));
fxParamSliders[i].onValueChange = [i, this]() {
this->processor.prepareParametersAbsentAudio();
this->processor.setFXParamValue01(i, this->fxParamSliders[i].getValue());
fxParamDisplay[i].setDisplay(
processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
fxParamSliders[i].setTextValue(processor.getParamValue(i).c_str());
};
fxParamSliders[i].onDragStart = [i, this]() {
this->processor.setUserEditingFXParam(i, true);
};
fxParamSliders[i].onDragEnd = [i, this]() {
this->processor.setUserEditingFXParam(i, false);
};
// fxParamSliders[i].setRange(0.0, 1.0, 0.0001);
// fxParamSliders[i].setValue(processor.getFXStorageValue01(i),
// juce::NotificationType::dontSendNotification);
//
// fxParamSliders[i].setSliderStyle(juce::Slider::SliderStyle::RotaryHorizontalVerticalDrag);
// fxParamSliders[i].setTextBoxStyle(juce::Slider::TextEntryBoxPosition::NoTextBox, true, 0,
// 0);
// fxParamSliders[i].setChangeNotificationOnlyOnRelease(false);
// fxParamSliders[i].setEnabled(processor.getParamEnabled(i));
// fxParamSliders[i].onValueChange = [i, this]() {
// this->processor.prepareParametersAbsentAudio();
// this->processor.setFXParamValue01(i, this->fxParamSliders[i].getValue());
// fxParamDisplay[i].setDisplay(
// processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
// fxParamSliders[i].setTextValue(processor.getParamValue(i).c_str());
// };
// fxParamSliders[i].onDragStart = [i, this]() {
// this->processor.setUserEditingFXParam(i, true);
// };
// fxParamSliders[i].onDragEnd = [i, this]() {
// this->processor.setUserEditingFXParam(i, false);
// };
fxParamSliders[i].setTitle("Parameter " + std::to_string(i) + " Knob");
addAndMakeVisibleRecordOrder(&(fxParamSliders[i]));

Expand All @@ -167,8 +168,8 @@ SurgefxAudioProcessorEditor::SurgefxAudioProcessorEditor(SurgefxAudioProcessor &
this->processor.setUserEditingParamFeature(i, true);
this->processor.setFXParamTempoSync(i, this->fxTempoSync[i].getToggleState());
this->processor.setFXStorageTempoSync(i, this->fxTempoSync[i].getToggleState());
fxParamDisplay[i].setDisplay(
processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
// fxParamDisplay[i].setDisplay(
// processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
this->processor.setUserEditingParamFeature(i, false);
};

Expand Down Expand Up @@ -200,8 +201,8 @@ SurgefxAudioProcessorEditor::SurgefxAudioProcessorEditor(SurgefxAudioProcessor &
this->processor.setUserEditingParamFeature(i, true);
this->processor.setFXParamExtended(i, this->fxExtended[i].getToggleState());
this->processor.setFXStorageExtended(i, this->fxExtended[i].getToggleState());
fxParamDisplay[i].setDisplay(
processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
// fxParamDisplay[i].setDisplay(
// processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
this->processor.setUserEditingParamFeature(i, false);
};
fxExtended[i].setTitle("Parameter " + std::to_string(i) + " Extended");
Expand All @@ -216,8 +217,8 @@ SurgefxAudioProcessorEditor::SurgefxAudioProcessorEditor(SurgefxAudioProcessor &
this->processor.setUserEditingParamFeature(i, true);
this->processor.setFXParamAbsolute(i, this->fxAbsoluted[i].getToggleState());
this->processor.setFXStorageAbsolute(i, this->fxAbsoluted[i].getToggleState());
fxParamDisplay[i].setDisplay(
processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
// fxParamDisplay[i].setDisplay(
// processor.getParamValueFromFloat(i, this->fxParamSliders[i].getValue()));
this->processor.setUserEditingParamFeature(i, false);
};

Expand Down Expand Up @@ -285,8 +286,8 @@ void SurgefxAudioProcessorEditor::resetLabels()
for (int i = 0; i < n_fx_params; ++i)
{
auto nm = processor.getParamName(i) + " " + processor.getParamGroup(i);
fxParamSliders[i].setValue(processor.getFXStorageValue01(i),
juce::NotificationType::dontSendNotification);
// fxParamSliders[i].setValue(processor.getFXStorageValue01(i),
// juce::NotificationType::dontSendNotification);
fxParamDisplay[i].setDisplay(processor.getParamValue(i).c_str());
fxParamDisplay[i].setGroup(processor.getParamGroup(i).c_str());
fxParamDisplay[i].setName(processor.getParamName(i).c_str());
Expand All @@ -297,7 +298,7 @@ void SurgefxAudioProcessorEditor::resetLabels()
fxParamSliders[i].setEnabled(processor.getParamEnabled(i) &&
!processor.getFXStorageAppearsDeactivated(i));
st(fxParamSliders[i], nm + " Knob");
fxParamSliders[i].setTextValue(processor.getParamValue(i).c_str());
// fxParamSliders[i].setTextValue(processor.getParamValue(i).c_str());

fxTempoSync[i].setEnabled(processor.canTempoSync(i));
fxTempoSync[i].setAccessible(processor.canTempoSync(i));
Expand Down Expand Up @@ -353,7 +354,7 @@ void SurgefxAudioProcessorEditor::paramsChangedCallback()
{
if (i < n_fx_params)
{
fxParamSliders[i].setValue(fv[i], juce::NotificationType::dontSendNotification);
// fxParamSliders[i].setValue(fv[i], juce::NotificationType::dontSendNotification);
fxParamDisplay[i].setDisplay(processor.getParamValueFor(i, fv[i]));
}
else
Expand Down
4 changes: 2 additions & 2 deletions src/surge-fx/SurgeFXEditor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "SurgeLookAndFeel.h"

#include "juce_gui_basics/juce_gui_basics.h"

#include "sst/jucegui/components/Knob.h"
//==============================================================================
/**
*/
Expand Down Expand Up @@ -159,7 +159,7 @@ class SurgefxAudioProcessorEditor : public juce::AudioProcessorEditor,
return false;
}
};
AccSlider fxParamSliders[n_fx_params];
sst::jucegui::components::Knob fxParamSliders[n_fx_params];
SurgeFXParamDisplay fxParamDisplay[n_fx_params];
SurgeTempoSyncSwitch fxTempoSync[n_fx_params];
SurgeTempoSyncSwitch fxDeactivated[n_fx_params];
Expand Down

0 comments on commit e4d4adb

Please sign in to comment.