diff options
| -rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_markers.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 7 |
3 files changed, 15 insertions, 0 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 13902a111f..9e4b3ada19 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1524,6 +1524,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void marker_menu_edit (); void marker_menu_remove (); void marker_menu_rename (); + void rename_marker (Marker *marker); void toggle_marker_menu_lock (); void toggle_marker_menu_glue (); void marker_menu_hide (); diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 3bca0ad935..af968029d5 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -1338,6 +1338,13 @@ Editor::marker_menu_rename () /*NOTREACHED*/ } + + rename_marker (marker); +} + +void +Editor::rename_marker(Marker *marker) +{ Location* loc; bool is_start; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index c91e9d1b34..67d6e1341c 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1407,9 +1407,16 @@ Editor::button_double_click_handler (ArdourCanvas::Item* item, GdkEvent* event, case RegionItem: case NoteItem: case PlayheadCursorItem: + break; case MarkerItem: case RangeMarkerBarItem: case CdMarkerBarItem: + Marker* marker; + if ((marker = static_cast<Marker *> (item->get_data ("marker"))) == 0) { + break; + } + rename_marker (marker); + return true; case TempoMarkerItem: case MeterMarkerItem: case MarkerBarItem: |