summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2014-07-22 16:05:51 -0500
committerBen Loftis <ben@harrisonconsoles.com>2014-07-22 16:05:51 -0500
commitfdaa6a151aa6b0022879d282802b2166aec653dc (patch)
tree6af56c782e0c50dbe3f3327a086ace3469396090 /gtk2_ardour
parent25024e550ace5961e866803b21afbd0a2b9997ea (diff)
3 monitor tweaks for the_CLA. shift+click to default, and new preset vals
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_knob.cc7
-rw-r--r--gtk2_ardour/monitor_section.cc2
2 files changed, 8 insertions, 1 deletions
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<PBD::Controllable> 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 ();