summaryrefslogtreecommitdiff
path: root/gtk2_ardour/editor_summary.cc
diff options
context:
space:
mode:
authorColin Fletcher <colin.m.fletcher@googlemail.com>2012-08-02 10:30:48 +0000
committerColin Fletcher <colin.m.fletcher@googlemail.com>2012-08-02 10:30:48 +0000
commitee80d2a95ff1fddf3a79c2541a4aade88a6b4a09 (patch)
treec73a477ab6a5715fcc44734c176d82d85caf9a86 /gtk2_ardour/editor_summary.cc
parent9743340fa37f4354824abb95b169c558144869ba (diff)
Use accelerator key of "/Editor/set-playhead" action to position playhead in editor summary pane, rather than hard-coding the default accelerator of 'p'.
git-svn-id: svn://localhost/ardour2/branches/3.0@13106 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_summary.cc')
-rw-r--r--gtk2_ardour/editor_summary.cc29
1 files changed, 14 insertions, 15 deletions
diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc
index d9fc4b1443..7ce74f414b 100644
--- a/gtk2_ardour/editor_summary.cc
+++ b/gtk2_ardour/editor_summary.cc
@@ -310,17 +310,15 @@ bool
EditorSummary::on_key_press_event (GdkEventKey* key)
{
gint x, y;
-
- switch (key->keyval) {
- case GDK_p:
- if (_session) {
- get_pointer (x, y);
- _session->request_locate ((framepos_t) x / _x_scale, _session->transport_rolling());
- return true;
+ GtkAccelKey set_playhead_accel;
+ if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
+ if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
+ if (_session) {
+ get_pointer (x, y);
+ _session->request_locate ((framepos_t) x / _x_scale, _session->transport_rolling());
+ return true;
+ }
}
- break;
- default:
- break;
}
return false;
@@ -329,11 +327,12 @@ EditorSummary::on_key_press_event (GdkEventKey* key)
bool
EditorSummary::on_key_release_event (GdkEventKey* key)
{
- switch (key->keyval) {
- case GDK_p:
- return true;
- default:
- break;
+
+ GtkAccelKey set_playhead_accel;
+ if (gtk_accel_map_lookup_entry ("<Actions>/Editor/set-playhead", &set_playhead_accel)) {
+ if (key->keyval == set_playhead_accel.accel_key && (int) key->state == set_playhead_accel.accel_mods) {
+ return true;
+ }
}
return false;
}