homeburger/metabalus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package slider components into its own widget

Browse Source
This commit is contained in:
Blitblank
2025-12-25 21:39:12 -06:00
parent 65fd963a3f
commit 97de073690
13 changed files with 244 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@@ -44,6 +44,7 @@ qt_add_executable(metabolus
src/main.cpp src/main.cpp
src/ui/MainWindow.cpp src/ui/MainWindow.cpp
src/ui/MainWindow.h src/ui/MainWindow.h
src/ui/MainWindow.ui
src/ParameterStore.h src/ParameterStore.h
src/KeyboardController.cpp src/KeyboardController.cpp
src/KeyboardController.h src/KeyboardController.h
@@ -56,8 +57,16 @@ qt_add_executable(metabolus
src/synth/Synth.cpp src/synth/Synth.cpp
src/synth/Synth.h src/synth/Synth.h
resources/resources.qrc resources/resources.qrc
src/ui/MainWindow.ui src/ui/widgets/SmartSlider.cpp
src/ui/SmartSlider.ui src/ui/widgets/SmartSlider.h
src/ui/widgets/SmartSlider.ui
)
set_target_properties(metabolus PROPERTIES AUTOUIC ON)
target_include_directories(metabolus PRIVATE
${CMAKE_SOURCE_DIR}/src/ui
${CMAKE_SOURCE_DIR}/src/ui/widgets
) )
if (WIN32) if (WIN32)

2
src/ParameterStore.h
View File

@@ -39,7 +39,7 @@ constexpr std::array<ParamDef, static_cast<size_t>(ParamId::Count)> PARAM_DEFS {
{ 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvA, { 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvA,
{ 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvD, { 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvD,
{ 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvS, { 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvS,
{ 10.0f, 0.0f, 1000.0f}, // Osc1VolumeEnvR, { 0.2f, 0.0f, 2.0f}, // Osc1VolumeEnvR,
{ 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvA, { 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvA,
{ 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvD, { 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvD,
{ 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvS, { 10.0f, 0.0f, 1000.0f}, // FilterCutoffEnvS,

10
src/synth/AudioEngine.h
View File

@@ -29,15 +29,15 @@ private:
// RtAudio binding for passing samples // RtAudio binding for passing samples
static int32_t audioCallback(void* outputBuffer, void* inputBuffer, uint32_t nFrames, double streamTime, RtAudioStreamStatus status, void* userData); static int32_t audioCallback(void* outputBuffer, void* inputBuffer, uint32_t nFrames, double streamTime, RtAudioStreamStatus status, void* userData);
// calls the synth.process to generate a buffer audio samples // calls the synth.process to generate a buffer of audio samples
int32_t process(float* out, uint32_t nFrames); int32_t process(float* out, uint32_t nFrames);
ParameterStore params_; ParameterStore params_; // stores the control parameters
NoteQueue noteQueue_; NoteQueue noteQueue_; // stores note events for passing between threads
Synth synth_; Synth synth_; // generates audio
RtAudio audio_; // audio device
// TODO: id like a yml config file or something for these // TODO: id like a yml config file or something for these
RtAudio audio_;
uint32_t sampleRate_ = 44100; uint32_t sampleRate_ = 44100;
uint32_t bufferFrames_ = 256; // time per buffer = BF/SR (256/44100 = 5.8ms) uint32_t bufferFrames_ = 256; // time per buffer = BF/SR (256/44100 = 5.8ms)
uint32_t channels_ = 2; // stereo uint32_t channels_ = 2; // stereo

1
src/synth/Envelope.h
View File

@@ -21,6 +21,7 @@ public:
// setters // setters
void setSampleRate(float sampleRate) { sampleRate_ = sampleRate; } void setSampleRate(float sampleRate) { sampleRate_ = sampleRate; }
void set(float a, float d, float s, float r) { setAttack(a); setDecay(a); setSustain(a); setRelease(a); }
void setAttack(float seconds) { attack_ = std::max(seconds, 0.0001f); } void setAttack(float seconds) { attack_ = std::max(seconds, 0.0001f); }
void setDecay(float seconds) { decay_ = std::max(seconds, 0.0001f); } void setDecay(float seconds) { decay_ = std::max(seconds, 0.0001f); }
void setSustain(float level) { sustain_ = level; } void setSustain(float level) { sustain_ = level; }

7
src/synth/Synth.cpp
View File

@@ -73,6 +73,8 @@ void Synth::process(float* out, uint32_t nFrames, uint32_t sampleRate) {
for(auto& p : params_) p.update(); // TODO: profile this for(auto& p : params_) p.update(); // TODO: profile this
// process all envelopes // process all envelopes
//gainEnvelope_.set(0.05f, 0.2f, 0.7f, getParam(ParamId::Osc1VolumeEnvR));
gainEnvelope_.setRelease(getParam(ParamId::Osc1VolumeEnvR));
float gain = gainEnvelope_.process(); float gain = gainEnvelope_.process();
// skip if no active notes // skip if no active notes
@@ -85,10 +87,13 @@ void Synth::process(float* out, uint32_t nFrames, uint32_t sampleRate) {
float phaseInc = 2.0f * M_PI * frequency_ / static_cast<float>(sampleRate); float phaseInc = 2.0f * M_PI * frequency_ / static_cast<float>(sampleRate);
// sample generation // sample generation
// TODO: wavetables
// TODO: wavetables should be scaled by their RMS for equal loudness (prelim standard = 0.707)
float sineSample = std::sin(phase_); float sineSample = std::sin(phase_);
float squareSample = -0.707f; float squareSample = -0.707f;
if(phase_ >= M_PI) squareSample = 0.707f; if(phase_ >= M_PI) squareSample = 0.707f;
sampleOut = squareSample * gain; float sawSample = phase_ * 4.0f / M_PI * frequency_ / static_cast<float>(sampleRate);
sampleOut = sawSample * gain;
// write to buffer // write to buffer
out[2*i] = sampleOut; // left out[2*i] = sampleOut; // left

76
src/ui/MainWindow.cpp
View File

@@ -1,9 +1,8 @@
#include "MainWindow.h" #include "MainWindow.h"
#include <QTimer>
#include "ui_MainWindow.h" #include "ui_MainWindow.h"
#include "SmartSlider.h"
#include "../ParameterStore.h" #include "../ParameterStore.h"
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
@@ -22,25 +21,18 @@ MainWindow::MainWindow(QWidget *parent) :
connect(ui_->buttonIncrement, &QPushButton::clicked, this, &MainWindow::onIncrementClicked); connect(ui_->buttonIncrement, &QPushButton::clicked, this, &MainWindow::onIncrementClicked);
connect(ui_->buttonReset, &QPushButton::clicked, this, &MainWindow::onResetClicked); connect(ui_->buttonReset, &QPushButton::clicked, this, &MainWindow::onResetClicked);
// slider business
// TODO: smart slider widget
connect(ui_->slider, &QSlider::valueChanged, this, &MainWindow::onSliderValueChanged);
connect(ui_->inputMin, &QLineEdit::editingFinished, this, &MainWindow::onMinChanged);
connect(ui_->inputMax, &QLineEdit::editingFinished, this, &MainWindow::onMaxChanged);
connect(ui_->inputStep, &QLineEdit::editingFinished, this, &MainWindow::onStepChanged);
connect(ui_->inputValue, &QLineEdit::editingFinished, this, &MainWindow::onValueChanged);
// synth business // synth business
audio_->start(); audio_->start();
// init defaults // slider business
// TODO:: there's gotta be a better way connect(ui_->sliderGainR, &SmartSlider::valueChanged, this, [this](float v) {
ui_->slider->setValue(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].def); audio_->parameters()->set(ParamId::Osc1VolumeEnvR, v); // bind valueChanged signal to the ParameterStore
ui_->slider->setMinimum(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].min); });
ui_->slider->setMaximum(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].max); // initialize to defaults
ui_->inputValue->setText(QString::number(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].def)); ui_->sliderGainR->setRange(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1VolumeEnvR)].min, PARAM_DEFS[static_cast<size_t>(ParamId::Osc1VolumeEnvR)].max);
ui_->inputMin->setText(QString::number(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].min)); ui_->sliderGainR->setValue(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1VolumeEnvR)].def);
ui_->inputMax->setText(QString::number(PARAM_DEFS[static_cast<size_t>(ParamId::Osc1Frequency)].max)); // TODO: package a smartSlider into an envelope controller widget
// then intialization and parameter bindings can be done from the envelope controller
} }
MainWindow::~MainWindow() { MainWindow::~MainWindow() {
@@ -68,51 +60,3 @@ void MainWindow::onResetClicked() {
void MainWindow::updateCounterLabel() { void MainWindow::updateCounterLabel() {
ui_->labelCounter->setText(QString::number(counter_)); ui_->labelCounter->setText(QString::number(counter_));
} }
// allows only numbers to be set
void MainWindow::onSliderValueChanged(int value) {
QSignalBlocker blocker(ui_->inputValue);
ui_->inputValue->setText(QString::number(value));
// forward value so synthesizer can read
audio_->parameters()->set(ParamId::Osc1Frequency, static_cast<float>(value));
}
// allows only values within the min, max to be set by the text field
void MainWindow::onValueChanged() {
bool ok = false;
int value = ui_->inputValue->text().toInt(&ok);
if(!ok) return;
value = qBound(ui_->slider->minimum(), value, ui_->slider->maximum());
ui_->slider->setValue(value);
}
void MainWindow::applySliderRange() {
bool minOk, maxOk;
int min = ui_->inputMin->text().toInt(&minOk);
int max = ui_->inputMax->text().toInt(&maxOk);
if(!minOk || !maxOk || min > max) return;
ui_->slider->setRange(min, max);
syncValueToUi(ui_->slider->value());
}
void MainWindow::applySliderStep() {
bool ok;
int step = ui_->inputStep->text().toInt(&ok);
if(!ok || step <= 0) return;
ui_->slider->setSingleStep(step);
ui_->slider->setPageStep(step);
}
void MainWindow::syncValueToUi(int value) {
QSignalBlocker block1(ui_->slider);
QSignalBlocker block2(ui_->inputValue);
value = qBound(ui_->slider->minimum(), value, ui_->slider->maximum());
ui_->slider->setValue(value);
ui_->inputValue->setText(QString::number(value));
}

18
src/ui/MainWindow.h
View File

@@ -7,13 +7,11 @@
#include "../synth/AudioEngine.h" #include "../synth/AudioEngine.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Ui { namespace Ui { class MainWindow; }
class MainWindow;
}
QT_END_NAMESPACE QT_END_NAMESPACE
class MainWindow : public QMainWindow class MainWindow : public QMainWindow {
{
Q_OBJECT Q_OBJECT
public: public:
@@ -28,12 +26,6 @@ private slots:
void onIncrementClicked(); void onIncrementClicked();
void onResetClicked(); void onResetClicked();
void onSliderValueChanged(int value);
void onMinChanged() { applySliderRange(); }
void onMaxChanged() { applySliderRange(); }
void onStepChanged() { applySliderStep(); }
void onValueChanged();
private: private:
Ui::MainWindow *ui_; Ui::MainWindow *ui_;
int counter_ = 0; int counter_ = 0;
@@ -42,10 +34,6 @@ private:
void updateCounterLabel(); void updateCounterLabel();
void applySliderRange();
void applySliderStep();
void syncValueToUi(int value);
AudioEngine* audio_ = nullptr; AudioEngine* audio_ = nullptr;
KeyboardController keyboard_; KeyboardController keyboard_;

126
src/ui/MainWindow.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>600</height> <height>605</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -71,124 +71,26 @@
<set>Qt::AlignmentFlag::AlignCenter</set> <set>Qt::AlignmentFlag::AlignCenter</set>
</property> </property>
</widget> </widget>
<widget class="QSlider" name="slider"> <widget class="SmartSlider" name="sliderGainR" native="true">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>390</x> <x>340</x>
<y>210</y> <y>120</y>
<width>16</width> <width>171</width>
<height>160</height> <height>321</height>
</rect> </rect>
</property> </property>
<property name="value">
<number>50</number>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
</widget>
<widget class="QLineEdit" name="inputMax">
<property name="geometry">
<rect>
<x>370</x>
<y>190</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<stylestrategy>PreferDefault</stylestrategy>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>100</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="inputStep">
<property name="geometry">
<rect>
<x>370</x>
<y>170</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<stylestrategy>PreferDefault</stylestrategy>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>100</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="inputValue">
<property name="geometry">
<rect>
<x>360</x>
<y>140</y>
<width>81</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>16</pointsize>
<stylestrategy>PreferDefault</stylestrategy>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>100</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
<widget class="QLineEdit" name="inputMin">
<property name="geometry">
<rect>
<x>370</x>
<y>370</y>
<width>61</width>
<height>21</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
<stylestrategy>PreferDefault</stylestrategy>
</font>
</property>
<property name="layoutDirection">
<enum>Qt::LayoutDirection::LeftToRight</enum>
</property>
<property name="text">
<string>100</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget> </widget>
</widget> </widget>
</widget> </widget>
<customwidgets>
<customwidget>
<class>SmartSlider</class>
<extends>QWidget</extends>
<header>SmartSlider.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/> <resources/>
<connections/> <connections/>
</ui> </ui>

0
src/ui/SmartSlider.ui
View File

88
src/ui/widgets/SmartSlider.cpp Normal file
View File

@@ -0,0 +1,88 @@
#include "SmartSlider.h"
#include "ui_SmartSlider.h"
#include <iostream>
SmartSlider::SmartSlider(QWidget* parent) : QWidget(parent), ui_(new Ui::SmartSlider) {
ui_->setupUi(this);
ui_->slider->setMinimum(0);
ui_->slider->setMaximum(sliderResolution_);
// connect widgets to slots
connect(ui_->slider, &QSlider::valueChanged, this, &SmartSlider::onSliderChanged);
connect(ui_->spinValue, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &SmartSlider::onSpinValueChanged);
connect(ui_->spinMin, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &SmartSlider::onRangeChanged);
connect(ui_->spinMax, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &SmartSlider::onRangeChanged);
}
SmartSlider::~SmartSlider() {
delete ui_;
}
// sets range of the slider, updates the spinBoxes, and clamps output, called by other classes
// probably overengineered
void SmartSlider::setRange(float min, float max) {
if (min >= max) return;
min_ = min; max_ = max;
ui_->slider->setRange(0, sliderResolution_);
ui_->spinMin->setValue(min_);
ui_->spinMax->setValue(max_);
//ui_->spinValue->setRange(min_, max_);
float value = ui_->spinValue->value();
value = std::clamp(value, min_, max_);
float t = (value - min_) / (max_ - min_);
int32_t sliderValue = static_cast<int32_t>(t) * sliderResolution_;
ui_->slider->setValue(sliderValue);
ui_->spinValue->setValue(value);
}
// sets value of the slider and the spinBox, called by other classes
void SmartSlider::setValue(float value) {
value = std::clamp(value, min_, max_);
float t = (value - min_) / (max_ - min_);
int32_t sliderValue = static_cast<int32_t>(t) * sliderResolution_;
ui_->slider->setValue(sliderValue);
ui_->spinValue->setValue(value);
emit valueChanged(value);
}
void SmartSlider::onSliderChanged(int32_t v) {
float min = ui_->spinMin->value();
float max = ui_->spinMax->value();
float value = min + (max - min) * static_cast<float>(v) / sliderResolution_;
ui_->spinValue->setValue(value);
emit valueChanged(value);
}
void SmartSlider::onSpinValueChanged(float v) {
float min = ui_->spinMin->value();
float max = ui_->spinMax->value();
float norm = (v - min) / (max - min);
int32_t sliderValue = qRound(norm * sliderResolution_);
ui_->slider->setValue(sliderValue);
// intentionally skips clamping by min/max
emit valueChanged(v);
}
void SmartSlider::onRangeChanged() {
float min = ui_->spinMin->value();
float max = ui_->spinMax->value();
onSpinValueChanged(ui_->spinValue->value());
}

13
src/widgets/SmartSlider.h → src/ui/widgets/SmartSlider.h
View File

@@ -7,19 +7,18 @@ QT_BEGIN_NAMESPACE
namespace Ui { class SmartSlider; } namespace Ui { class SmartSlider; }
QT_END_NAMESPACE QT_END_NAMESPACE
// SmartSlider is the widget including a slider, min/max settings, and a value setting parameter
class SmartSlider : public QWidget { class SmartSlider : public QWidget {
Q_OBJECT Q_OBJECT
public: public:
explicit SmartSlider(QWidget* parent = nullptr); explicit SmartSlider(QWidget* parent = nullptr);
~SmartSlider() = default; ~SmartSlider();
// setters
void setRange(float min, float max); void setRange(float min, float max);
void setStep(float step);
void setValue(float value); void setValue(float value);
void value() const;
signals: signals:
void valueChanged(float value); void valueChanged(float value);
@@ -32,6 +31,12 @@ private:
Ui::SmartSlider* ui_; Ui::SmartSlider* ui_;
// slider just does ints from 0 to this value
// all the floating point business happens in here
int sliderResolution_ = 10000; int sliderResolution_ = 10000;
float min_;
float max_;
// I got rid of step because it just didn't work right and I really didn't need it
}; };

96
src/ui/widgets/SmartSlider.ui Normal file
View File

@@ -0,0 +1,96 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SmartSlider</class>
<widget class="QWidget" name="SmartSlider">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>168</width>
<height>298</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<widget class="QSlider" name="slider">
<property name="geometry">
<rect>
<x>70</x>
<y>90</y>
<width>16</width>
<height>160</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
</widget>
<widget class="QDoubleSpinBox" name="spinMin">
<property name="geometry">
<rect>
<x>40</x>
<y>260</y>
<width>82</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QDoubleSpinBox" name="spinMax">
<property name="geometry">
<rect>
<x>40</x>
<y>60</y>
<width>82</width>
<height>24</height>
</rect>
</property>
</widget>
<widget class="QDoubleSpinBox" name="spinValue">
<property name="geometry">
<rect>
<x>40</x>
<y>10</y>
<width>82</width>
<height>31</height>
</rect>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
</widget>
<widget class="Line" name="line">
<property name="geometry">
<rect>
<x>20</x>
<y>10</y>
<width>20</width>
<height>271</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
</widget>
<widget class="Line" name="line_2">
<property name="geometry">
<rect>
<x>120</x>
<y>10</y>
<width>20</width>
<height>271</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

35
src/widgets/SmartSlider.cpp
View File

@@ -1,35 +0,0 @@
#include "SmartSlider.h"
SmartSlider(QWidget* parent = nullptr) {
}
void SmartSlider::setRange(float min, float max) {
}
void SmartSlider::setStep(float step) {
}
void SmartSlider::setValue(float value) {
}
void SmartSlider::value() const;
void SmartSlider::valueChanged(float value) {
}
void SmartSlider::onSliderChanged(int v) {
}
void SmartSlider::onSpinValueChanged(float v) {
}
void SmartSlider::onRangeChanged() {
}