diff --git a/Userland/Applications/Piano/KnobsWidget.cpp b/Userland/Applications/Piano/KnobsWidget.cpp index 59d332716e..cb329bca4a 100644 --- a/Userland/Applications/Piano/KnobsWidget.cpp +++ b/Userland/Applications/Piano/KnobsWidget.cpp @@ -34,7 +34,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) m_values_container->set_layout(); m_values_container->set_fixed_height(10); - m_volume_value = m_values_container->add(String::number(m_track_manager.current_track()->volume())); + m_volume_value = m_values_container->add(String::number(0)); m_octave_value = m_values_container->add(String::number(m_track_manager.keyboard()->virtual_keyboard_octave())); m_knobs_container = add(); @@ -44,15 +44,7 @@ KnobsWidget::KnobsWidget(TrackManager& track_manager, MainWidget& main_widget) m_volume_knob = m_knobs_container->add(); 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(); m_octave_knob->set_tooltip("Z: octave down, X: octave up"); @@ -111,7 +103,6 @@ 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.keyboard()->virtual_keyboard_octave()); m_change_underlying = true; diff --git a/Userland/Libraries/LibDSP/Track.cpp b/Userland/Libraries/LibDSP/Track.cpp index 7a99ba48af..20e8829922 100644 --- a/Userland/Libraries/LibDSP/Track.cpp +++ b/Userland/Libraries/LibDSP/Track.cpp @@ -43,18 +43,6 @@ bool Track::check_processor_chain_valid_with_initial_type(SignalType initial_typ return true; } -float Track::volume() const -{ - // FIXME: This is a hack until we have a Master processor - return 1.0f; -} - -void Track::set_volume(float volume) const -{ - // FIXME: This is a hack until we have a Master processor - (void)volume; -} - NonnullRefPtr Track::synth() { return static_ptr_cast(m_processor_chain.ptr_at(0)); diff --git a/Userland/Libraries/LibDSP/Track.h b/Userland/Libraries/LibDSP/Track.h index df333df6c1..e55c596537 100644 --- a/Userland/Libraries/LibDSP/Track.h +++ b/Userland/Libraries/LibDSP/Track.h @@ -36,9 +36,6 @@ public: NonnullRefPtrVector const& processor_chain() const { return m_processor_chain; } NonnullRefPtr transport() const { return m_transport; } - float volume() const; - void set_volume(float volume) const; - // FIXME: These two getters are temporary until we have dynamic processor UI NonnullRefPtr synth(); NonnullRefPtr delay();