diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-21 20:42:22 +0000 |
| commit | 061a85191c301ac18f2e8ca59d43127a4499ba96 (patch) | |
| tree | 469688f4dea1853c91372319a899b2efc71b30d5 /gtk2_ardour/editor_audio_import.cc | |
| parent | d9cebc2edf8accded23c6f2a1caab73eb47a50fd (diff) | |
Move Diskstream ownership to Track, so that Session no longer holds lists of Diskstreams. Breaks 3.0 file format again.
git-svn-id: svn://localhost/ardour2/branches/3.0@6945 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_audio_import.cc')
| -rw-r--r-- | gtk2_ardour/editor_audio_import.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_audio_import.cc b/gtk2_ardour/editor_audio_import.cc index e7572ce8c1..119ea3bc51 100644 --- a/gtk2_ardour/editor_audio_import.cc +++ b/gtk2_ardour/editor_audio_import.cc @@ -852,7 +852,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t } } - boost::shared_ptr<Playlist> playlist = existing_track->diskstream()->playlist(); + boost::shared_ptr<Playlist> playlist = existing_track->playlist(); boost::shared_ptr<Region> copy (RegionFactory::create (region, region->properties())); begin_reversible_command (_("insert file")); playlist->clear_history (); @@ -887,7 +887,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t } boost::shared_ptr<Region> copy (RegionFactory::create (region)); - existing_track->diskstream()->playlist()->add_region (copy, pos); + existing_track->playlist()->add_region (copy, pos); break; } @@ -901,7 +901,7 @@ Editor::finish_bringing_in_material (boost::shared_ptr<Region> region, uint32_t if (!at.empty()) { boost::shared_ptr<Region> copy (RegionFactory::create (region)); at.front()->set_name (basename_nosuffix (copy->name())); - at.front()->diskstream()->playlist()->add_region (copy, pos); + at.front()->playlist()->add_region (copy, pos); } break; } |