mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 13:37:44 +00:00
Piano: Add track Volume and improve QOL
This patch implements a couple of enhancements to the synthesizer engine: * Each track has a volume control. * The input and tooltips for all controls are improved. * The noise channel is pitched, which allows for basic drum synthesis.
This commit is contained in:
kleines Filmröllchen
Andreas Kling
parent
418bc484e4
commit
d77e7e99e4
5 changed files with 87 additions and 39 deletions
|
|
@ -12,12 +12,6 @@
|
|||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/Slider.h>
|
||||
|
||||
constexpr int max_attack = 1000;
|
||||
constexpr int max_decay = 1000;
|
||||
constexpr int max_sustain = 1000;
|
||||
constexpr int max_release = 1000;
|
||||
constexpr int max_delay = 8;
|
||||
|
||||
KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
||||
: m_track_manager(track_manager)
|
||||
, m_main_widget(main_widget)
|
||||
|
|
@ -29,6 +23,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
m_labels_container->set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_labels_container->set_fixed_height(20);
|
||||
|
||||
m_volume_label = m_labels_container->add<GUI::Label>("Volume");
|
||||
m_octave_label = m_labels_container->add<GUI::Label>("Octave");
|
||||
m_wave_label = m_labels_container->add<GUI::Label>("Wave");
|
||||
m_attack_label = m_labels_container->add<GUI::Label>("Attack");
|
||||
|
|
@ -41,6 +36,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
m_values_container->set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_values_container->set_fixed_height(10);
|
||||
|
||||
m_volume_value = m_values_container->add<GUI::Label>(String::number(m_track_manager.current_track().volume()));
|
||||
m_octave_value = m_values_container->add<GUI::Label>(String::number(m_track_manager.octave()));
|
||||
m_wave_value = m_values_container->add<GUI::Label>(wave_strings[m_track_manager.current_track().wave()]);
|
||||
m_attack_value = m_values_container->add<GUI::Label>(String::number(m_track_manager.current_track().attack()));
|
||||
|
|
@ -54,10 +50,23 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
|
||||
// FIXME: Implement vertical flipping in GUI::Slider, not here.
|
||||
|
||||
m_volume_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_volume_knob->set_range(0, volume_max);
|
||||
m_volume_knob->set_value(volume_max - m_track_manager.current_track().volume());
|
||||
m_volume_knob->set_step(10);
|
||||
m_volume_knob->on_change = [this](int value) {
|
||||
int new_volume = volume_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_volume(new_volume);
|
||||
VERIFY(new_volume == m_track_manager.current_track().volume());
|
||||
m_volume_value->set_text(String::number(new_volume));
|
||||
};
|
||||
|
||||
m_octave_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_octave_knob->set_tooltip("Z: octave down, X: octave up");
|
||||
m_octave_knob->set_range(octave_min - 1, octave_max - 1);
|
||||
m_octave_knob->set_value((octave_max - 1) - (m_track_manager.octave() - 1));
|
||||
m_octave_knob->set_step(1);
|
||||
m_octave_knob->on_change = [this](int value) {
|
||||
int new_octave = octave_max - value;
|
||||
if (m_change_underlying)
|
||||
|
|
@ -70,6 +79,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
m_wave_knob->set_tooltip("C: cycle through waveforms");
|
||||
m_wave_knob->set_range(0, last_wave);
|
||||
m_wave_knob->set_value(last_wave - m_track_manager.current_track().wave());
|
||||
m_wave_knob->set_step(1);
|
||||
m_wave_knob->on_change = [this](int value) {
|
||||
int new_wave = last_wave - value;
|
||||
if (m_change_underlying)
|
||||
|
|
@ -79,11 +89,12 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
};
|
||||
|
||||
m_attack_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_attack_knob->set_range(0, max_attack);
|
||||
m_attack_knob->set_value(max_attack - m_track_manager.current_track().attack());
|
||||
m_attack_knob->set_step(100);
|
||||
m_attack_knob->set_tooltip("Envelope attack in milliseconds");
|
||||
m_attack_knob->set_range(0, attack_max);
|
||||
m_attack_knob->set_value(attack_max - m_track_manager.current_track().attack());
|
||||
m_attack_knob->set_step(25);
|
||||
m_attack_knob->on_change = [this](int value) {
|
||||
int new_attack = max_attack - value;
|
||||
int new_attack = attack_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_attack(new_attack);
|
||||
VERIFY(new_attack == m_track_manager.current_track().attack());
|
||||
|
|
@ -91,11 +102,12 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
};
|
||||
|
||||
m_decay_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_decay_knob->set_range(0, max_decay);
|
||||
m_decay_knob->set_value(max_decay - m_track_manager.current_track().decay());
|
||||
m_decay_knob->set_step(100);
|
||||
m_decay_knob->set_tooltip("Envelope decay in milliseconds");
|
||||
m_decay_knob->set_range(0, decay_max);
|
||||
m_decay_knob->set_value(decay_max - m_track_manager.current_track().decay());
|
||||
m_decay_knob->set_step(25);
|
||||
m_decay_knob->on_change = [this](int value) {
|
||||
int new_decay = max_decay - value;
|
||||
int new_decay = decay_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_decay(new_decay);
|
||||
VERIFY(new_decay == m_track_manager.current_track().decay());
|
||||
|
|
@ -103,11 +115,12 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
};
|
||||
|
||||
m_sustain_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_sustain_knob->set_range(0, max_sustain);
|
||||
m_sustain_knob->set_value(max_sustain - m_track_manager.current_track().sustain());
|
||||
m_sustain_knob->set_step(100);
|
||||
m_sustain_knob->set_tooltip("Envelope sustain level percent");
|
||||
m_sustain_knob->set_range(0, sustain_max);
|
||||
m_sustain_knob->set_value(sustain_max - m_track_manager.current_track().sustain());
|
||||
m_sustain_knob->set_step(25);
|
||||
m_sustain_knob->on_change = [this](int value) {
|
||||
int new_sustain = max_sustain - value;
|
||||
int new_sustain = sustain_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_sustain(new_sustain);
|
||||
VERIFY(new_sustain == m_track_manager.current_track().sustain());
|
||||
|
|
@ -115,11 +128,12 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
};
|
||||
|
||||
m_release_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_release_knob->set_range(0, max_release);
|
||||
m_release_knob->set_value(max_release - m_track_manager.current_track().release());
|
||||
m_release_knob->set_step(100);
|
||||
m_release_knob->set_tooltip("Envelope release in milliseconds");
|
||||
m_release_knob->set_range(0, release_max);
|
||||
m_release_knob->set_value(release_max - m_track_manager.current_track().release());
|
||||
m_release_knob->set_step(25);
|
||||
m_release_knob->on_change = [this](int value) {
|
||||
int new_release = max_release - value;
|
||||
int new_release = release_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_release(new_release);
|
||||
VERIFY(new_release == m_track_manager.current_track().release());
|
||||
|
|
@ -127,10 +141,12 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget)
|
|||
};
|
||||
|
||||
m_delay_knob = m_knobs_container->add<GUI::VerticalSlider>();
|
||||
m_delay_knob->set_range(0, max_delay);
|
||||
m_delay_knob->set_value(max_delay - m_track_manager.current_track().delay());
|
||||
m_delay_knob->set_tooltip("Delay speed, 0 = off");
|
||||
m_delay_knob->set_range(0, delay_max);
|
||||
m_delay_knob->set_value(delay_max - m_track_manager.current_track().delay());
|
||||
m_release_knob->set_step(1);
|
||||
m_delay_knob->on_change = [this](int value) {
|
||||
int new_delay = max_delay - value;
|
||||
int new_delay = delay_max - value;
|
||||
if (m_change_underlying)
|
||||
m_track_manager.current_track().set_delay(new_delay);
|
||||
VERIFY(new_delay == m_track_manager.current_track().delay());
|
||||
|
|
@ -151,13 +167,14 @@ void KnobsWidget::update_knobs()
|
|||
// need to change the slider without changing the underlying value.
|
||||
m_change_underlying = false;
|
||||
|
||||
m_volume_knob->set_value(volume_max - m_track_manager.current_track().volume());
|
||||
m_octave_knob->set_value(octave_max - m_track_manager.octave());
|
||||
m_wave_knob->set_value(last_wave - m_track_manager.current_track().wave());
|
||||
m_attack_knob->set_value(max_attack - m_track_manager.current_track().attack());
|
||||
m_decay_knob->set_value(max_decay - m_track_manager.current_track().decay());
|
||||
m_sustain_knob->set_value(max_sustain - m_track_manager.current_track().sustain());
|
||||
m_release_knob->set_value(max_release - m_track_manager.current_track().release());
|
||||
m_delay_knob->set_value(max_delay - m_track_manager.current_track().delay());
|
||||
m_attack_knob->set_value(attack_max - m_track_manager.current_track().attack());
|
||||
m_decay_knob->set_value(decay_max - m_track_manager.current_track().decay());
|
||||
m_sustain_knob->set_value(sustain_max - m_track_manager.current_track().sustain());
|
||||
m_release_knob->set_value(release_max - m_track_manager.current_track().release());
|
||||
m_delay_knob->set_value(delay_max - m_track_manager.current_track().delay());
|
||||
|
||||
m_change_underlying = true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue