added ui elements and profile loading for oscillator pitch parameters
This commit is contained in:
@@ -49,6 +49,67 @@ MainWindow::MainWindow(QWidget *parent) :
|
||||
audio_->parameters()->set(ParamId::Osc1WaveSelector2, index);
|
||||
});
|
||||
|
||||
// rogue sliders, TODO: clean these up in a package
|
||||
connect(ui_->sliderMasterOctave, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::MasterOctaveOffset, value);
|
||||
ui_->sliderMasterOctave->setResolution();
|
||||
});
|
||||
connect(ui_->sliderMasterSemitone, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::MasterSemitoneOffset, value);
|
||||
ui_->sliderMasterSemitone->setResolution();
|
||||
});
|
||||
connect(ui_->sliderMasterPitch, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::MasterPitchOffset, value);
|
||||
});
|
||||
|
||||
connect(ui_->sliderOsc1Octave, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc1OctaveOffset, value);
|
||||
ui_->sliderOsc1Octave->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc1Semitone, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc1SemitoneOffset, value);
|
||||
ui_->sliderOsc1Semitone->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc1Pitch, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc1PitchOffset, value);
|
||||
});
|
||||
|
||||
connect(ui_->sliderOsc2Octave, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc2OctaveOffset, value);
|
||||
ui_->sliderOsc2Octave->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc2Semitone, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc2SemitoneOffset, value);
|
||||
ui_->sliderOsc2Semitone->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc2Pitch, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc2PitchOffset, value);
|
||||
});
|
||||
|
||||
connect(ui_->sliderOsc3Octave, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc3OctaveOffset, value);
|
||||
ui_->sliderOsc3Octave->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc3Semitone, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc3SemitoneOffset, value);
|
||||
ui_->sliderOsc3Semitone->setResolution();
|
||||
});
|
||||
connect(ui_->sliderOsc3Pitch, &SmartSlider::valueChanged,
|
||||
this, [this](float value) {
|
||||
audio_->parameters()->set(ParamId::Osc3PitchOffset, value);
|
||||
});
|
||||
|
||||
// synth business
|
||||
audio_->start();
|
||||
|
||||
@@ -75,14 +136,59 @@ void MainWindow::onResetClicked() {
|
||||
|
||||
// initialize to defaults
|
||||
|
||||
config_.loadProfile("default");
|
||||
YAML::Node configRoot = config_.loadProfile("default");
|
||||
|
||||
// update ui from the paramstore
|
||||
ui_->envelopeOsc1Volume->init(EnvelopeId::Osc1Volume, config_.loadEnvProfile("default", "Osc1Volume"));
|
||||
ui_->envelopeFilterCutoff->init(EnvelopeId::FilterCutoff, config_.loadEnvProfile("default", "FilterCutoff"));
|
||||
ui_->envelopeFilterResonance->init(EnvelopeId::FilterResonance, config_.loadEnvProfile("default", "FilterResonance"));
|
||||
|
||||
ui_->comboOsc1WaveSelector1->setCurrentIndex(static_cast<int>(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1WaveSelector1)].def));
|
||||
ui_->comboOsc1WaveSelector2->setCurrentIndex(static_cast<int>(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1WaveSelector2)].def));
|
||||
// TODO: clean these up, maybe put them in a package like the envelope generators (it'll help encapsulate the int-snapping business)
|
||||
ui_->sliderMasterOctave->setResolution(configRoot["MasterOctaveOffset"][2].as<int>() - configRoot["MasterOctaveOffset"][1].as<int>());
|
||||
ui_->sliderMasterOctave->setRange(configRoot["MasterOctaveOffset"][1].as<int>(), configRoot["MasterOctaveOffset"][2].as<int>());
|
||||
ui_->sliderMasterOctave->setValue(configRoot["MasterOctaveOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderMasterSemitone->setResolution(configRoot["MasterSemitoneOffset"][2].as<int>() - configRoot["MasterSemitoneOffset"][1].as<int>());
|
||||
ui_->sliderMasterSemitone->setRange(configRoot["MasterSemitoneOffset"][1].as<int>(), configRoot["MasterSemitoneOffset"][2].as<int>());
|
||||
ui_->sliderMasterSemitone->setValue(configRoot["MasterSemitoneOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderMasterPitch->setRange(configRoot["MasterPitchOffset"][1].as<float>(), configRoot["MasterPitchOffset"][2].as<float>());
|
||||
ui_->sliderMasterPitch->setValue(configRoot["MasterPitchOffset"][0].as<float>());
|
||||
|
||||
ui_->sliderOsc1Octave->setResolution(configRoot["Osc1OctaveOffset"][2].as<int>() - configRoot["Osc1OctaveOffset"][1].as<int>());
|
||||
ui_->sliderOsc1Octave->setRange(configRoot["Osc1OctaveOffset"][1].as<int>(), configRoot["Osc1OctaveOffset"][2].as<int>());
|
||||
ui_->sliderOsc1Octave->setValue(configRoot["Osc1OctaveOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc1Semitone->setResolution(configRoot["Osc1SemitoneOffset"][2].as<int>() - configRoot["Osc1SemitoneOffset"][1].as<int>());
|
||||
ui_->sliderOsc1Semitone->setRange(configRoot["Osc1SemitoneOffset"][1].as<int>(), configRoot["Osc1SemitoneOffset"][2].as<int>());
|
||||
ui_->sliderOsc1Semitone->setValue(configRoot["Osc1SemitoneOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc1Pitch->setRange(configRoot["Osc1PitchOffset"][1].as<float>(), configRoot["Osc1PitchOffset"][2].as<float>());
|
||||
ui_->sliderOsc1Pitch->setValue(configRoot["Osc1PitchOffset"][0].as<float>());
|
||||
|
||||
ui_->sliderOsc2Octave->setResolution(configRoot["Osc2OctaveOffset"][2].as<int>() - configRoot["Osc2OctaveOffset"][1].as<int>());
|
||||
ui_->sliderOsc2Octave->setRange(configRoot["Osc2OctaveOffset"][1].as<int>(), configRoot["Osc2OctaveOffset"][2].as<int>());
|
||||
ui_->sliderOsc2Octave->setValue(configRoot["Osc2OctaveOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc2Semitone->setResolution(configRoot["Osc2SemitoneOffset"][2].as<int>() - configRoot["Osc2SemitoneOffset"][1].as<int>());
|
||||
ui_->sliderOsc2Semitone->setRange(configRoot["Osc2SemitoneOffset"][1].as<int>(), configRoot["Osc2SemitoneOffset"][2].as<int>());
|
||||
ui_->sliderOsc2Semitone->setValue(configRoot["Osc2SemitoneOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc2Pitch->setRange(configRoot["Osc2PitchOffset"][1].as<float>(), configRoot["Osc2PitchOffset"][2].as<float>());
|
||||
ui_->sliderOsc2Pitch->setValue(configRoot["Osc2PitchOffset"][0].as<float>());
|
||||
|
||||
ui_->sliderOsc3Octave->setResolution(configRoot["Osc3OctaveOffset"][2].as<int>() - configRoot["Osc3OctaveOffset"][1].as<int>());
|
||||
ui_->sliderOsc3Octave->setRange(configRoot["Osc3OctaveOffset"][1].as<int>(), configRoot["Osc3OctaveOffset"][2].as<int>());
|
||||
ui_->sliderOsc3Octave->setValue(configRoot["Osc3OctaveOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc3Semitone->setResolution(configRoot["Osc3SemitoneOffset"][2].as<int>() - configRoot["Osc3SemitoneOffset"][1].as<int>());
|
||||
ui_->sliderOsc3Semitone->setRange(configRoot["Osc3SemitoneOffset"][1].as<int>(), configRoot["Osc3SemitoneOffset"][2].as<int>());
|
||||
ui_->sliderOsc3Semitone->setValue(configRoot["Osc3SemitoneOffset"][0].as<int>());
|
||||
|
||||
ui_->sliderOsc3Pitch->setRange(configRoot["Osc3PitchOffset"][1].as<float>(), configRoot["Osc3PitchOffset"][2].as<float>());
|
||||
ui_->sliderOsc3Pitch->setValue(configRoot["Osc3PitchOffset"][0].as<float>());
|
||||
|
||||
ui_->comboOsc1WaveSelector1->setCurrentIndex(configRoot["OscWaveSelector1"].as<int>());
|
||||
ui_->comboOsc1WaveSelector2->setCurrentIndex(configRoot["OscWaveSelector2"].as<int>());
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user