smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-17 04:06:26 +01:00
Code Issues Projects Releases Wiki Activity

Remove non-working attempt to make time selection changes undo-able. Cleanup use of _have_transaction.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6477 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-01-12 13:17:57 +00:00
parent b691c32bc6
commit 642f41b82f
2 changed files with 2 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
gtk2_ardour/editor_drag.cc
View file

@ -57,7 +57,6 @@ Drag::Drag (Editor* e, ArdourCanvas::Item* i)
: _editor (e) : _editor (e)
, _item (i) , _item (i)
, _pointer_frame_offset (0) , _pointer_frame_offset (0)
, _have_transaction (false)
, _ending (false) , _ending (false)
, _move_threshold_passed (false) , _move_threshold_passed (false)
, _grab_frame (0) , _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_position = (_last_frame_position != (nframes64_t) (_primary->region()->position()));
changed_tracks = (_dest_trackview != &_primary->get_time_axis_view()); 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<RegionView*> const & v) TrimDrag::TrimDrag (Editor* e, ArdourCanvas::Item* i, RegionView* p, list<RegionView*> const & v)
: RegionDrag (e, i, p, 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) { if (left_direction) {
frame_delta = (last_pointer_frame() - pf); frame_delta = (last_pointer_frame() - pf);
} else { } else {
@ -3111,9 +3106,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
if (first_move) { if (first_move) {
_editor->begin_reversible_command (_("range selection"));
_have_transaction = true;
if (_copy) { if (_copy) {
/* adding to the selection */ /* adding to the selection */
_editor->selection->add (_editor->clicked_axisview); _editor->selection->add (_editor->clicked_axisview);
@ -3162,11 +3154,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
case SelectionStartTrim: case SelectionStartTrim:
if (first_move) {
_editor->begin_reversible_command (_("trim selection start"));
_have_transaction = true;
}
start = _editor->selection->time[_editor->clicked_selection].start; start = _editor->selection->time[_editor->clicked_selection].start;
end = _editor->selection->time[_editor->clicked_selection].end; end = _editor->selection->time[_editor->clicked_selection].end;
@ -3179,11 +3166,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
case SelectionEndTrim: case SelectionEndTrim:
if (first_move) {
_editor->begin_reversible_command (_("trim selection end"));
_have_transaction = true;
}
start = _editor->selection->time[_editor->clicked_selection].start; start = _editor->selection->time[_editor->clicked_selection].start;
end = _editor->selection->time[_editor->clicked_selection].end; end = _editor->selection->time[_editor->clicked_selection].end;
@ -3197,11 +3179,6 @@ SelectionDrag::motion (GdkEvent* event, bool first_move)
case SelectionMove: case SelectionMove:
if (first_move) {
_editor->begin_reversible_command (_("move selection"));
_have_transaction = true;
}
start = _editor->selection->time[_editor->clicked_selection].start; start = _editor->selection->time[_editor->clicked_selection].start;
end = _editor->selection->time[_editor->clicked_selection].end; end = _editor->selection->time[_editor->clicked_selection].end;
@ -3242,10 +3219,6 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
_editor->selection->TimeChanged (); _editor->selection->TimeChanged ();
} }
if (_have_transaction) {
_editor->commit_reversible_command ();
}
/* XXX what if its a music time selection? */ /* XXX what if its a music time selection? */
if (s && (s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) { if (s && (s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) {
s->request_play_range (&_editor->selection->time, true); s->request_play_range (&_editor->selection->time, true);

2
gtk2_ardour/editor_drag.h
View file

@ -162,7 +162,6 @@ protected:
bool _x_constrained; ///< true if x motion is constrained, otherwise false bool _x_constrained; ///< true if x motion is constrained, otherwise false
bool _y_constrained; ///< true if y 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 _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: private:
@ -378,6 +377,7 @@ public:
private: private:
Operation _operation; Operation _operation;
bool _have_transaction; ///< true if a transaction has been started, false otherwise. Must be set true by derived class.
}; };
/** Meter marker drag */ /** Meter marker drag */