Remove old destructive API (non layered is a dynamic mode) 1/2

[ardour.git] / gtk2_ardour / editor_mouse.cc

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 13b5e6e8e56f597bf8b0288e07d044eb153ec622..d268192e5645c0e4200e0ac4dfde0227f0350766 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -46,6 +46,8 @@
 #include "ardour/session.h"
 #include "ardour/types.h"
 
+#include "widgets/prompter.h"
+
 #include "actions.h"
 #include "ardour_ui.h"
 #include "editor.h"
@@ -58,7 +60,6 @@
 #include "region_gain_line.h"
 #include "automation_time_axis.h"
 #include "control_point.h"
-#include "prompter.h"
 #include "selection.h"
 #include "keyboard.h"
 #include "editing.h"
@@ -1584,14 +1585,14 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
                        return true;
                case TempoBarItem:
                case TempoCurveItem:
-                       if (!_dragging_playhead) {
+                       if (!_dragging_playhead && Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
                                snap_to_with_modifier (where, event);
                                mouse_add_new_tempo_event (where.frame);
                        }
                        return true;
 
                case MeterBarItem:
-                       if (!_dragging_playhead) {
+                       if (!_dragging_playhead && Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) {
                                mouse_add_new_meter_event (pixel_to_sample (event->button.x));
                        }
                        return true;
@@ -2159,12 +2160,8 @@ Editor::edit_notes (MidiRegionView* mrv)
 void
 Editor::note_edit_done (int r, EditNoteDialog* d)
 {
-       begin_reversible_command (_("edit note(s)"));
-
        d->done (r);
        delete d;
-
-       commit_reversible_command();
 }
 
 void
@@ -2352,7 +2349,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/)
 {
        using namespace Gtkmm2ext;
 
-       ArdourPrompter prompter (false);
+       ArdourWidgets::Prompter prompter (false);
 
        prompter.set_prompt (_("Name for region:"));
        prompter.set_initial_text (clicked_regionview->region()->name());