diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 0aa5e53b4e..5203e1d489 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -57,7 +57,6 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i) : _editor (e) , _item (i) , _pointer_frame_offset (0) - , _have_transaction (false) , _ending (false) , _move_threshold_passed (false) , _grab_frame (0) @@ -785,8 +784,6 @@ RegionMoveDrag::finished (GdkEvent* /*event*/, bool movement_occurred) } } - _have_transaction = true; - changed_position = (_last_frame_position != (nframes64_t) (_primary->region()->position())); changed_tracks = (_dest_trackview != &_primary->get_time_axis_view()); @@ -1543,6 +1540,7 @@ RegionGainDrag::aborted () TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list const & v) : RegionDrag (e, i, p, v) + , _have_transaction (false) { } @@ -1662,9 +1660,6 @@ TrimDrag::motion (GdkEvent* event, bool first_move) } } - /* XXX i hope to god that we can really conclude this ... */ - _have_transaction = true; - if (left_direction) { frame_delta = (last_pointer_frame() - pf); } else { @@ -3111,9 +3106,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) if (first_move) { - _editor->begin_reversible_command (_("range selection")); - _have_transaction = true; - if (_copy) { /* adding to the selection */ _editor->selection->add (_editor->clicked_axisview); @@ -3162,11 +3154,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) case SelectionStartTrim: - if (first_move) { - _editor->begin_reversible_command (_("trim selection start")); - _have_transaction = true; - } - start = _editor->selection->time[_editor->clicked_selection].start; end = _editor->selection->time[_editor->clicked_selection].end; @@ -3179,11 +3166,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) case SelectionEndTrim: - if (first_move) { - _editor->begin_reversible_command (_("trim selection end")); - _have_transaction = true; - } - start = _editor->selection->time[_editor->clicked_selection].start; end = _editor->selection->time[_editor->clicked_selection].end; @@ -3197,11 +3179,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move) case SelectionMove: - if (first_move) { - _editor->begin_reversible_command (_("move selection")); - _have_transaction = true; - } - start = _editor->selection->time[_editor->clicked_selection].start; end = _editor->selection->time[_editor->clicked_selection].end; @@ -3242,10 +3219,6 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred) _editor->selection->TimeChanged (); } - if (_have_transaction) { - _editor->commit_reversible_command (); - } - /* XXX what if its a music time selection? */ if (s && (s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) { s->request_play_range (&_editor->selection->time, true); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 2b0207c7df..6b6a9ee1b5 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -162,7 +162,6 @@ protected: bool _x_constrained; ///< true if x motion is constrained, otherwise false bool _y_constrained; ///< true if y motion is constrained, otherwise false bool _was_rolling; ///< true if the session was rolling before the drag started, otherwise false - bool _have_transaction; ///< true if a transaction has been started, false otherwise. Must be set true by derived class. private: @@ -378,6 +377,7 @@ public: private: Operation _operation; + bool _have_transaction; ///< true if a transaction has been started, false otherwise. Must be set true by derived class. }; /** Meter marker drag */