summaryrefslogtreecommitdiff
path: root/gtk2_ardour/region_selection.cc
diff options
context:
space:
mode:
authorCarl Hetherington <carl@carlh.net>2010-09-06 12:34:11 +0000
committerCarl Hetherington <carl@carlh.net>2010-09-06 12:34:11 +0000
commitea2648503b520e3da54263ce0bafb388d22a9cd8 (patch)
tree3c3142d6ae31e256945b4254c5cac494c332661d /gtk2_ardour/region_selection.cc
parent1206b2973dc6c55bf81b4adfed928b95ac94bb9c (diff)
Cleanup of region drag code to be a bit more efficient and shorter. Fixes crashes when dragging regions to the wrong track type.
git-svn-id: svn://localhost/ardour2/branches/3.0@7744 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_selection.cc')
-rw-r--r--gtk2_ardour/region_selection.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index 9ac96d682b..1a5a556514 100644
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -253,10 +253,10 @@ struct RegionSortByTrack {
/* really, track and position */
- if (a->get_trackview().order() == b->get_trackview().order()) {
+ if (a->get_time_axis_view().order() == b->get_time_axis_view().order()) {
return a->region()->position() < b->region()->position();
} else {
- return a->get_trackview().order() < b->get_trackview().order();
+ return a->get_time_axis_view().order() < b->get_time_axis_view().order();
}
}
};
@@ -298,7 +298,7 @@ bool
RegionSelection::involves (const TimeAxisView& tv) const
{
for (RegionSelection::const_iterator i = begin(); i != end(); ++i) {
- if (&(*i)->get_trackview() == &tv) {
+ if (&(*i)->get_time_axis_view() == &tv) {
return true;
}
}