diff options
| author | David Robillard <d@drobilla.net> | 2009-02-16 07:04:27 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-16 07:04:27 +0000 |
| commit | 64bf6f004a35aa61cdc4a22d419ce9d3f4c57579 (patch) | |
| tree | cdb93a82e66d9b9bdb155b9e3a4da64bc6d0e247 /gtk2_ardour/editor.cc | |
| parent | f12cfb3d87295daa8fc622f2200476e661ebb6fe (diff) | |
Fix a bunch of the ol' trivial audio-specific-for-no-particular-reason things.
Re-addition of this sort of thing is now officially punishable by death ;)
git-svn-id: svn://localhost/ardour2/branches/3.0@4603 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0932a046e0..719ac2a266 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4966,21 +4966,18 @@ Editor::get_regions_at (RegionSelection& rs, nframes64_t where, const TrackSelec } for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { - - AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t); - - if (atv) { + RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t); + if (rtv) { boost::shared_ptr<Diskstream> ds; boost::shared_ptr<Playlist> pl; - if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) { + if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { - Playlist::RegionList* regions = pl->regions_at ((nframes64_t) floor ( (double)where * ds->speed())); + Playlist::RegionList* regions = pl->regions_at ( + (nframes64_t) floor ( (double)where * ds->speed())); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { - - RegionView* rv = atv->audio_view()->find_view (*i); - + RegionView* rv = rtv->view()->find_view (*i); if (rv) { rs.add (rv); } @@ -5004,20 +5001,19 @@ Editor::get_regions_after (RegionSelection& rs, nframes64_t where, const TrackSe } for (TrackSelection::const_iterator t = tracks->begin(); t != tracks->end(); ++t) { - - AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(*t); - - if (atv) { + RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(*t); + if (rtv) { boost::shared_ptr<Diskstream> ds; boost::shared_ptr<Playlist> pl; - if ((ds = atv->get_diskstream()) && ((pl = ds->playlist()))) { + if ((ds = rtv->get_diskstream()) && ((pl = ds->playlist()))) { - Playlist::RegionList* regions = pl->regions_touched ((nframes64_t) floor ( (double)where * ds->speed()), max_frames); + Playlist::RegionList* regions = pl->regions_touched ( + (nframes64_t) floor ( (double)where * ds->speed()), max_frames); for (Playlist::RegionList::iterator i = regions->begin(); i != regions->end(); ++i) { - RegionView* rv = atv->audio_view()->find_view (*i); + RegionView* rv = rtv->view()->find_view (*i); if (rv) { rs.push_back (rv); |