From fdaa6a151aa6b0022879d282802b2166aec653dc Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 22 Jul 2014 16:05:51 -0500 Subject: [PATCH] 3 monitor tweaks for the_CLA. shift+click to default, and new preset vals --- gtk2_ardour/ardour_knob.cc | 7 +++++++ gtk2_ardour/monitor_section.cc | 2 +- libs/pbd/pbd/controllable.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/ardour_knob.cc b/gtk2_ardour/ardour_knob.cc index ade83e504c..7021cb9df1 100644 --- a/gtk2_ardour/ardour_knob.cc +++ b/gtk2_ardour/ardour_knob.cc @@ -335,6 +335,13 @@ ArdourKnob::on_button_press_event (GdkEventButton *ev) bool ArdourKnob::on_button_release_event (GdkEventButton *ev) { + if ( (_grabbed_y == ev->y) && Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { //no move, shift-click sets to default + boost::shared_ptr c = binding_proxy.get_controllable(); + if (!c) return false; + c->set_value (c->normal()); + return true; + } + _grabbed = false; unset_active_state (); diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 3f7ebfaa6e..4b285defea 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -192,6 +192,7 @@ MonitorSection::MonitorSection (Session* s) solo_cut_display->add_controllable_preset("-6 dB", -6.0); solo_cut_display->add_controllable_preset("-12 dB", -12.0); solo_cut_display->add_controllable_preset("-20 dB", -20.0); + solo_cut_display->add_controllable_preset("OFF", -1200.0); spin_label = manage (new Label (_("SiP Cut"))); spin_packer = manage (new VBox); @@ -218,7 +219,6 @@ MonitorSection::MonitorSection (Session* s) dim_display->add_controllable_preset("-6 dB", -6.0); dim_display->add_controllable_preset("-12 dB", -12.0); dim_display->add_controllable_preset("-20 dB", -20.0); - dim_display->add_controllable_preset("-30 dB", -30.0); HBox* dim_packer = manage (new HBox); dim_packer->show (); diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index fb8f79db09..fbe10f3841 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -103,6 +103,7 @@ class LIBPBD_API Controllable : public PBD::StatefulDestructible { virtual double lower() const { return 0.0; } virtual double upper() const { return 1.0; } + virtual double normal() const { return 0.0; } //the default value Flag flags() const { return _flags; } void set_flags (Flag f); -- 2.30.2