summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-07-14 01:24:16 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-07-14 01:24:16 +0000
commitf01af9836e46fb2c459d16e9956ff6b9be0355d0 (patch)
tree04445b709f1009e14f0c2ac6c1ce0116e43a5664 /gtk2_ardour
parent997dd32d5ea12ec9412858ac0bdbc88e603ca8a1 (diff)
fix broken accels in mixer window BUT note that processor box now swallows keys that have default GTK functions in a tree/listview, like space. thinking about possible solutions to this. added zero key (0) to reset gain to 0dB
git-svn-id: svn://localhost/ardour2/branches/3.0@5361 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/mixer_strip.cc6
-rw-r--r--gtk2_ardour/mixer_ui.cc3
-rw-r--r--gtk2_ardour/processor_box.cc2
3 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index a0e3f2e25b..b18e1699b2 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -1530,6 +1530,12 @@ MixerStrip::on_key_press_event (GdkEventKey* ev)
}
return true;
break;
+
+ case GDK_0:
+ if (_route) {
+ _route->set_gain (1.0, this);
+ }
+ return true;
default:
break;
diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc
index c3904b7e26..00c16f59b6 100644
--- a/gtk2_ardour/mixer_ui.cc
+++ b/gtk2_ardour/mixer_ui.cc
@@ -1478,7 +1478,8 @@ Mixer_UI::on_key_press_event (GdkEventKey* ev)
bool
Mixer_UI::on_key_release_event (GdkEventKey* ev)
{
- return key_press_focus_accelerator_handler (*this, ev);
+ return Gtk::Window::on_key_release_event (ev);
+ // return key_press_focus_accelerator_handler (*this, ev);
}
void
diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc
index f2f3543762..9ba3632d2d 100644
--- a/gtk2_ardour/processor_box.cc
+++ b/gtk2_ardour/processor_box.cc
@@ -383,7 +383,7 @@ ProcessorBox::processor_key_release_event (GdkEventKey *ev)
ret = true;
break;
- case GDK_KP_0:
+ case GDK_slash:
for (ProcSelection::iterator i = targets.begin(); i != targets.end(); ++i) {
if ((*i)->active()) {
(*i)->deactivate ();