smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

fixup cherry-picked changes from Waves Tracks, and fix for Ardour

Browse source
This commit is contained in:
Paul Davis 2015-02-05 20:26:02 -05:00
parent 7644533103
commit ec37c83507
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/editor_drag.cc
View file

@ -3550,8 +3550,15 @@ MarkerDrag::aborted (bool movement_occured)
/* move all markers to their original location */ /* move all markers to their original location */
for (vector<Marker*>::iterator m = x->markers.begin(); m != x->markers.end(); ++m) { for (vector<Marker*>::iterator m = x->markers.begin(); m != x->markers.end(); ++m) {
(*m)->set_position ((*m)->location()->start(), (*m)->location()->end());
bool is_start;
Location * location = _editor->find_location_from_marker (*m, is_start);
if (location) {
(*m)->set_position (is_start ? location->start() : location->end());
}
} }
} }
} }
@ -4726,7 +4733,6 @@ void
RangeMarkerBarDrag::aborted (bool movement_occured) RangeMarkerBarDrag::aborted (bool movement_occured)
{ {
if (movement_occured) { if (movement_occured) {
_crect->hide ();
_drag_rect->hide (); _drag_rect->hide ();
} }
} }
@ -5497,9 +5503,9 @@ void
CrossfadeEdgeDrag::aborted (bool) CrossfadeEdgeDrag::aborted (bool)
{ {
if (start) { if (start) {
arv->redraw_start_xfade (); // arv->redraw_start_xfade ();
} else { } else {
arv->redraw_end_xfade (); // arv->redraw_end_xfade ();
} }
} }