diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-09-06 12:34:11 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-09-06 12:34:11 +0000 |
| commit | ea2648503b520e3da54263ce0bafb388d22a9cd8 (patch) | |
| tree | 3c3142d6ae31e256945b4254c5cac494c332661d /gtk2_ardour/selection.cc | |
| parent | 1206b2973dc6c55bf81b4adfed928b95ac94bb9c (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/selection.cc')
| -rw-r--r-- | gtk2_ardour/selection.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index d04c986092..59928dc303 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -400,7 +400,7 @@ Selection::add (vector<RegionView*>& v) if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); if (Config->get_link_region_and_track_selection() && changed) { - add (&(*i)->get_trackview()); + add (&(*i)->get_time_axis_view()); } } } @@ -422,7 +422,7 @@ Selection::add (const RegionSelection& rs) if (find (regions.begin(), regions.end(), (*i)) == regions.end()) { changed = regions.add ((*i)); if (Config->get_link_region_and_track_selection() && changed) { - add (&(*i)->get_trackview()); + add (&(*i)->get_time_axis_view()); } } } @@ -438,7 +438,7 @@ Selection::add (RegionView* r) if (find (regions.begin(), regions.end(), r) == regions.end()) { regions.add (r); if (Config->get_link_region_and_track_selection()) { - add (&r->get_trackview()); + add (&r->get_time_axis_view()); } RegionsChanged (); } @@ -452,7 +452,7 @@ Selection::add (MidiRegionView* mrv) /* XXX should we do this? */ #if 0 if (Config->get_link_region_and_track_selection()) { - add (&mrv->get_trackview()); + add (&mrv->get_time_axis_view()); } #endif MidiRegionsChanged (); @@ -610,8 +610,8 @@ Selection::remove (RegionView* r) RegionsChanged (); } - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) { - remove (&r->get_trackview()); + if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { + remove (&r->get_time_axis_view()); } } @@ -627,8 +627,8 @@ Selection::remove (MidiRegionView* mrv) #if 0 /* XXX fix this up ? */ - if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_trackview())) { - remove (&r->get_trackview()); + if (Config->get_link_region_and_track_selection() && !regions.involves (r->get_time_axis_view())) { + remove (&r->get_time_axis_view()); } #endif } |