X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion_factory.cc;h=3e815247504ee3cab21387c2a47877853f0054fd;hb=4caecfa310a973773a74e74939896133ad6d4c8d;hp=2bc84f8988be23221a46f127d90ff5cd851f7054;hpb=ddc513c38da165eab91a24eb1ccc73464d408393;p=ardour.git diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 2bc84f8988..3e81524750 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -36,11 +36,12 @@ using namespace PBD; using namespace std; PBD::Signal1 > RegionFactory::CheckNewRegion; -Glib::StaticMutex RegionFactory::region_map_lock; +Glib::Threads::Mutex RegionFactory::region_map_lock; RegionFactory::RegionMap RegionFactory::region_map; PBD::ScopedConnectionList* RegionFactory::region_list_connections = 0; -Glib::StaticMutex RegionFactory::region_name_map_lock; -std::map RegionFactory::region_name_map; +Glib::Threads::Mutex RegionFactory::region_name_maps_mutex; +std::map RegionFactory::region_name_number_map; +std::map RegionFactory::region_name_map; RegionFactory::CompoundAssociations RegionFactory::_compound_associations; boost::shared_ptr @@ -284,9 +285,7 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) if (ret) { if (ret->set_state (node, Stateful::loading_state_version)) { ret.reset (); - cerr << "set state on region failed\n"; } else { - cerr << "add region " << ret->id() << " to region map\n"; map_add (ret); /* Don't fiddle with position_lock_style here as the region @@ -311,7 +310,7 @@ RegionFactory::map_add (boost::shared_ptr r) p.second = r; { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); region_map.insert (p); } @@ -322,7 +321,7 @@ RegionFactory::map_add (boost::shared_ptr r) r->DropReferences.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::map_remove, boost::weak_ptr (r))); r->PropertyChanged.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr (r))); - update_region_name_map (r); + add_to_region_name_maps (r); } void @@ -333,10 +332,11 @@ RegionFactory::map_remove (boost::weak_ptr w) return; } - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); RegionMap::iterator i = region_map.find (r->id()); if (i != region_map.end()) { + remove_from_region_name_map (i->second->name ()); region_map.erase (i); } } @@ -383,9 +383,10 @@ RegionFactory::clear_map () } { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); region_map.clear (); _compound_associations.clear (); + region_name_map.clear (); } } @@ -396,7 +397,7 @@ RegionFactory::delete_all_regions () /* copy region list */ { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); copy = region_map; } @@ -416,12 +417,53 @@ RegionFactory::delete_all_regions () uint32_t RegionFactory::nregions () { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); return region_map.size (); } +/** Add a region to the two region name maps */ void -RegionFactory::update_region_name_map (boost::shared_ptr region) +RegionFactory::add_to_region_name_maps (boost::shared_ptr region) +{ + update_region_name_number_map (region); + + Glib::Threads::Mutex::Lock lm (region_name_maps_mutex); + region_name_map[region->name()] = region->id (); +} + +/** Account for a region rename in the two region name maps */ +void +RegionFactory::rename_in_region_name_maps (boost::shared_ptr region) +{ + update_region_name_number_map (region); + + Glib::Threads::Mutex::Lock lm (region_name_maps_mutex); + + map::iterator i = region_name_map.begin(); + while (i != region_name_map.end() && i->second != region->id ()) { + ++i; + } + + /* Erase the entry for the old name and put in a new one */ + if (i != region_name_map.end()) { + region_name_map.erase (i); + region_name_map[region->name()] = region->id (); + } +} + +/** Remove a region's details from the region_name_map */ +void +RegionFactory::remove_from_region_name_map (string n) +{ + map::iterator i = region_name_map.find (n); + if (i != region_name_map.end ()) { + region_name_map.erase (i); + } +} + +/** Update a region's entry in the region_name_number_map */ +void +RegionFactory::update_region_name_number_map (boost::shared_ptr region) { string::size_type const last_period = region->name().find_last_of ('.'); @@ -434,8 +476,8 @@ RegionFactory::update_region_name_map (boost::shared_ptr region) which is just fine */ - Glib::Mutex::Lock lm (region_name_map_lock); - region_name_map[base] = atoi (number.c_str ()); + Glib::Threads::Mutex::Lock lm (region_name_maps_mutex); + region_name_number_map[base] = atoi (number.c_str ()); } } @@ -448,7 +490,7 @@ RegionFactory::region_changed (PropertyChange const & what_changed, boost::weak_ } if (what_changed.contains (Properties::name)) { - update_region_name_map (r); + rename_in_region_name_maps (r); } } @@ -484,15 +526,15 @@ RegionFactory::region_name (string& result, string base, bool newlevel) } { - Glib::Mutex::Lock lm (region_name_map_lock); + Glib::Threads::Mutex::Lock lm (region_name_maps_mutex); map::iterator x; result = subbase; - if ((x = region_name_map.find (subbase)) == region_name_map.end()) { + if ((x = region_name_number_map.find (subbase)) == region_name_number_map.end()) { result += ".1"; - region_name_map[subbase] = 1; + region_name_number_map[subbase] = 1; } else { x->second++; snprintf (buf, sizeof (buf), ".%d", x->second); @@ -557,8 +599,6 @@ RegionFactory::new_region_name (string old) while (number < (UINT_MAX-1)) { - const RegionMap& regions (RegionFactory::regions()); - RegionMap::const_iterator i; string sbuf; number++; @@ -566,13 +606,7 @@ RegionFactory::new_region_name (string old) snprintf (buf, len, "%s%" PRIu32 "%s", old.substr (0, last_period + 1).c_str(), number, remainder.c_str()); sbuf = buf; - for (i = regions.begin(); i != regions.end(); ++i) { - if (i->second->name() == sbuf) { - break; - } - } - - if (i == regions.end()) { + if (region_name_map.find (sbuf) == region_name_map.end ()) { break; } } @@ -588,7 +622,7 @@ RegionFactory::new_region_name (string old) void RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set >& r) { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { if (i->second->uses_source (s)) { @@ -600,7 +634,7 @@ RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set src) { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); RegionMap::iterator i = region_map.begin(); while (i != region_map.end()) { @@ -609,6 +643,7 @@ RegionFactory::remove_regions_using_source (boost::shared_ptr src) ++j; if (i->second->uses_source (src)) { + remove_from_region_name_map (i->second->name ()); region_map.erase (i); } @@ -619,6 +654,6 @@ RegionFactory::remove_regions_using_source (boost::shared_ptr src) void RegionFactory::add_compound_association (boost::shared_ptr orig, boost::shared_ptr copy) { - Glib::Mutex::Lock lm (region_map_lock); + Glib::Threads::Mutex::Lock lm (region_map_lock); _compound_associations[copy] = orig; }