diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-16 15:33:04 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-16 15:33:04 +0000 |
| commit | 6ef5d85ae1f2c500c4163cd1df580b3f26991c1e (patch) | |
| tree | 15194a52bb72f036117fc4c87c193a4cbb64be8b /gtk2_ardour/route_ui.cc | |
| parent | 830911f6f9451d83a58043b3f9084d3caa164b7b (diff) | |
changes from 2.X starting in march 2009 through oct 20 2009 (5826 inclusive)
git-svn-id: svn://localhost/ardour2/branches/3.0@6761 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index befed97743..6c96ebac48 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -262,9 +262,10 @@ RouteUI::mute_press (GdkEventButton* ev) // Primary-button2 click is the midi binding click // button2-click is "momentary" - if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - return false; - } + + if (mute_button->on_button_press_event (ev)) { + return true; + } _mute_release = new SoloMuteRelease (_route->muted ()); } @@ -357,9 +358,9 @@ RouteUI::solo_press(GdkEventButton* ev) // Primary-button2 click is the midi binding click // button2-click is "momentary" - if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier))) { - return false; - } + if (solo_button->on_button_press_event (ev)) { + return true; + } _solo_release = new SoloMuteRelease (_route->soloed()); } @@ -491,10 +492,10 @@ RouteUI::rec_enable_press(GdkEventButton* ev) if (!ignore_toggle && is_track() && rec_enable_button) { - if (Keyboard::is_button2_event (ev) && Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { + if (Keyboard::is_button2_event (ev)) { // do nothing on midi sigc::bind event - return false; + return rec_enable_button->on_button_press_event (ev); } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { |