diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-22 16:11:00 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-05-22 16:11:00 +0000 |
commit | 9c733915a0bc4b5274fac749b1adc874da79a6ee (patch) | |
tree | 1db070ef198c7b7890cb98c84a37a1321c810183 /libs/ardour/region_factory.cc | |
parent | d40ee9548661f88db1bc1dcda0b463220d59a8d8 (diff) |
basic uncombining (no post-facto region trimming)
git-svn-id: svn://localhost/ardour2/branches/3.0@9566 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region_factory.cc')
-rw-r--r-- | libs/ardour/region_factory.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index eba237d0d2..513ec7301b 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -43,6 +43,7 @@ RegionFactory::RegionMap RegionFactory::region_map; PBD::ScopedConnectionList RegionFactory::region_list_connections; Glib::StaticMutex RegionFactory::region_name_map_lock; std::map<std::string, uint32_t> RegionFactory::region_name_map; +RegionFactory::CompoundAssociations RegionFactory::_compound_associations; boost::shared_ptr<Region> RegionFactory::create (boost::shared_ptr<const Region> region, bool announce) @@ -366,8 +367,8 @@ RegionFactory::clear_map () { Glib::Mutex::Lock lm (region_map_lock); region_map.clear (); + _compound_associations.clear (); } - } void @@ -561,3 +562,10 @@ RegionFactory::remove_regions_using_source (boost::shared_ptr<Source> src) } } } + +void +RegionFactory::add_compound_association (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> copy) +{ + Glib::Mutex::Lock lm (region_map_lock); + _compound_associations[copy] = orig; +} |