don't allow to delete AU presets in the UI

[ardour.git] / gtk2_ardour / editor_drag.cc

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index e84da9dc2a2b1693f7ae5def14120d92141c46db..12cea263b9cce1314a0d700e1ec30262345d5a15 100644 (file)
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -464,7 +464,7 @@ Drag::motion_handler (GdkEvent* event, bool from_autoscroll)
 
                                _last_pointer_x = _drags->current_pointer_x ();
                                _last_pointer_y = current_pointer_y ();
-                               _last_pointer_frame = adjusted_current_frame (event);
+                               _last_pointer_frame = adjusted_current_frame (event, false);
                        }
 
                        return true;
@@ -510,7 +510,7 @@ Drag::show_verbose_cursor_text (string const & text)
 }
 
 boost::shared_ptr<Region>
-Drag::add_midi_region (MidiTimeAxisView* view)
+Drag::add_midi_region (MidiTimeAxisView* view, bool commit)
 {
        if (_editor->session()) {
                const TempoMap& map (_editor->session()->tempo_map());
@@ -520,7 +520,7 @@ Drag::add_midi_region (MidiTimeAxisView* view)
                   might be wrong.
                */
                framecnt_t len = m.frames_per_bar (map.tempo_at (pos), _editor->session()->frame_rate());
-               return view->add_region (grab_frame(), len, true);
+               return view->add_region (grab_frame(), len, commit);
        }
 
        return boost::shared_ptr<Region>();
@@ -645,7 +645,7 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r
        /* compute the amount of pointer motion in frames, and where
           the region would be if we moved it by that much.
        */
-       *pending_region_position = adjusted_frame (_drags->current_pointer_frame () + snap_delta (event->button.state), event, true);
+       *pending_region_position = adjusted_frame (_drags->current_pointer_frame (), event, false);
 
        framepos_t sync_frame;
        framecnt_t sync_offset;
@@ -657,11 +657,12 @@ RegionMotionDrag::compute_x_delta (GdkEvent const * event, framepos_t* pending_r
         */
        if (sync_dir >= 0 || (sync_dir < 0 && *pending_region_position >= sync_offset)) {
 
-               sync_frame = *pending_region_position + (sync_dir * sync_offset);
+               framecnt_t const sd = snap_delta (event->button.state);
+               sync_frame = *pending_region_position + (sync_dir * sync_offset) + sd;
 
                _editor->snap_to_with_modifier (sync_frame, event);
 
-               *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - snap_delta (event->button.state);
+               *pending_region_position = _primary->region()->adjust_to_sync (sync_frame) - sd;
 
        } else {
                *pending_region_position = _last_frame_position;
@@ -2303,13 +2304,14 @@ void
 RegionCreateDrag::motion (GdkEvent* event, bool first_move)
 {
        if (first_move) {
-               _region = add_midi_region (_view);
+               _editor->begin_reversible_command (_("create region"));
+               _region = add_midi_region (_view, false);
                _view->playlist()->freeze ();
        } else {
                if (_region) {
                        framepos_t const f = adjusted_current_frame (event);
                        if (f < grab_frame()) {
-                               _region->set_position (f);
+                               _region->set_initial_position (f);
                        }
 
                        /* Don't use a zero-length region, and subtract 1 frame from the snapped length
@@ -2329,9 +2331,10 @@ void
 RegionCreateDrag::finished (GdkEvent*, bool movement_occurred)
 {
        if (!movement_occurred) {
-               add_midi_region (_view);
+               add_midi_region (_view, true);
        } else {
                _view->playlist()->thaw ();
+               _editor->commit_reversible_command();
        }
 }
 
@@ -3203,7 +3206,7 @@ MeterMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
        Timecode::BBT_Time when;
 
        TempoMap& map (_editor->session()->tempo_map());
-       map.bbt_time (last_pointer_frame(), when);
+       map.bbt_time (_marker->position(), when);
 
        if (_copy == true) {
                _editor->begin_reversible_command (_("copy meter mark"));
@@ -3302,6 +3305,7 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
                swap_grab (&_marker->the_item(), 0, GDK_CURRENT_TIME);
 
                if (!_copy) {
+                       _editor->begin_reversible_command (_("move tempo mark"));
                        TempoMap& map (_editor->session()->tempo_map());
                        /* get current state */
                        before_state = &map.get_state();
@@ -3332,7 +3336,7 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
        motion (event, false);
 
        TempoMap& map (_editor->session()->tempo_map());
-       framepos_t beat_time = map.round_to_beat (last_pointer_frame(), RoundNearest);
+       framepos_t beat_time = map.round_to_beat (_marker->position(), RoundNearest);
        Timecode::BBT_Time when;
 
        map.bbt_time (beat_time, when);
@@ -3346,7 +3350,6 @@ TempoMarkerDrag::finished (GdkEvent* event, bool movement_occurred)
                _editor->commit_reversible_command ();
 
        } else {
-               _editor->begin_reversible_command (_("move tempo mark"));
                /* we removed it before, so add it back now */
                map.add_tempo (_marker->tempo(), when);
                XMLNode &after = map.get_state();
@@ -4643,7 +4646,7 @@ RubberbandSelectDrag::finished (GdkEvent* event, bool movement_occurred)
                        /* MIDI track */
                        if (_editor->selection->empty() && _editor->mouse_mode == MouseDraw) {
                                /* nothing selected */
-                               add_midi_region (mtv);
+                               add_midi_region (mtv, true);
                                do_deselect = false;
                        }
                }