X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fregion_factory.cc;h=eba237d0d208942bbe5aa70c17d7c0ca37f23f69;hb=4fc42bca44651b927d336110c23e789691f3bb48;hp=3f4af2462c28e31aacf6a29e9b1bdc0caee83889;hpb=17088ee3ea5af1e6174b098bb5bcfdaec6ebf9b0;p=ardour.git diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 3f4af2462c..eba237d0d2 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -17,6 +17,8 @@ */ +#include + #include "pbd/error.h" #include "pbd/boost_debug.h" @@ -36,11 +38,14 @@ using namespace ARDOUR; using namespace PBD; PBD::Signal1 > RegionFactory::CheckNewRegion; -Glib::StaticMutex RegionFactory::region_map_lock; -RegionFactory::RegionMap RegionFactory::region_map; +Glib::StaticMutex RegionFactory::region_map_lock; +RegionFactory::RegionMap RegionFactory::region_map; +PBD::ScopedConnectionList RegionFactory::region_list_connections; +Glib::StaticMutex RegionFactory::region_name_map_lock; +std::map RegionFactory::region_name_map; boost::shared_ptr -RegionFactory::create (boost::shared_ptr region) +RegionFactory::create (boost::shared_ptr region, bool announce) { boost::shared_ptr ret; boost::shared_ptr ar; @@ -48,17 +53,11 @@ RegionFactory::create (boost::shared_ptr region) if ((ar = boost::dynamic_pointer_cast(region)) != 0) { - AudioRegion* arn = new AudioRegion (ar, 0, true); - boost_debug_shared_ptr_mark_interesting (arn, "Region"); - - boost::shared_ptr arp (arn); - ret = boost::static_pointer_cast (arp); + ret = boost::shared_ptr (new AudioRegion (ar, 0)); } else if ((mr = boost::dynamic_pointer_cast(region)) != 0) { - MidiRegion* mrn = new MidiRegion (mr, 0, true); - boost::shared_ptr mrp (mrn); - ret = boost::static_pointer_cast (mrp); + ret = boost::shared_ptr (new MidiRegion (mr, 0)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") @@ -67,17 +66,23 @@ RegionFactory::create (boost::shared_ptr region) } if (ret) { + ret->set_name (new_region_name(ret->name())); map_add (ret); /* pure copy constructor - no property list */ - /* pure copy constructor - no CheckNewRegion emitted */ + if (announce) { + CheckNewRegion (ret); + } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, const PropertyList& plist, bool announce) +RegionFactory::create (boost::shared_ptr region, const PropertyList& plist, bool announce) { boost::shared_ptr ret; boost::shared_ptr other_a; @@ -85,17 +90,11 @@ RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, c if ((other_a = boost::dynamic_pointer_cast(region)) != 0) { - AudioRegion* ar = new AudioRegion (other_a, offset, true); - boost_debug_shared_ptr_mark_interesting (ar, "Region"); - - boost::shared_ptr arp (ar); - ret = boost::static_pointer_cast (arp); + ret = boost::shared_ptr (new AudioRegion (other_a)); } else if ((other_m = boost::dynamic_pointer_cast(region)) != 0) { - MidiRegion* mr = new MidiRegion (other_m, offset, true); - boost::shared_ptr mrp (mr); - ret = boost::static_pointer_cast (mrp); + ret = boost::shared_ptr (new MidiRegion (other_m)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") @@ -105,7 +104,7 @@ RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, c } if (ret) { - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -113,11 +112,14 @@ RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, c } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } boost::shared_ptr -RegionFactory::create (boost::shared_ptr region, const PropertyList& plist, bool announce) +RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, const PropertyList& plist, bool announce) { boost::shared_ptr ret; boost::shared_ptr other_a; @@ -125,17 +127,11 @@ RegionFactory::create (boost::shared_ptr region, const PropertyList& pli if ((other_a = boost::dynamic_pointer_cast(region)) != 0) { - AudioRegion* ar = new AudioRegion (other_a, 0, false); - boost_debug_shared_ptr_mark_interesting (ar, "Region"); - - boost::shared_ptr arp (ar); - ret = boost::static_pointer_cast (arp); - + ret = boost::shared_ptr (new AudioRegion (other_a, offset)); + } else if ((other_m = boost::dynamic_pointer_cast(region)) != 0) { - MidiRegion* mr = new MidiRegion (other_m, 0, false); - boost::shared_ptr mrp (mr); - ret = boost::static_pointer_cast (mrp); + ret = boost::shared_ptr (new MidiRegion (other_m, offset)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") @@ -145,7 +141,7 @@ RegionFactory::create (boost::shared_ptr region, const PropertyList& pli } if (ret) { - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -153,12 +149,12 @@ RegionFactory::create (boost::shared_ptr region, const PropertyList& pli } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } - - - boost::shared_ptr RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, const PropertyList& plist, bool announce) { @@ -173,11 +169,7 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, // XXX use me in caller where plist is setup, this is start i think srcs.front()->length (srcs.front()->timeline_position()) - AudioRegion* ar = new AudioRegion (other, srcs); - boost_debug_shared_ptr_mark_interesting (ar, "Region"); - - boost::shared_ptr arp (ar); - ret = boost::static_pointer_cast (arp); + ret = boost::shared_ptr (new AudioRegion (other, srcs)); } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") @@ -186,8 +178,7 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, } if (ret) { - - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -195,8 +186,10 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; - } boost::shared_ptr @@ -216,23 +209,16 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a if ((as = boost::dynamic_pointer_cast(srcs[0])) != 0) { - AudioRegion* ar = new AudioRegion (srcs); - boost_debug_shared_ptr_mark_interesting (ar, "Region"); - - boost::shared_ptr arp (ar); - ret = boost::static_pointer_cast (arp); + ret = boost::shared_ptr (new AudioRegion (srcs)); } else if ((ms = boost::dynamic_pointer_cast(srcs[0])) != 0) { - MidiRegion* mr = new MidiRegion (srcs); - boost_debug_shared_ptr_mark_interesting (mr, "Region"); - boost::shared_ptr mrp (mr); - ret = boost::static_pointer_cast (mrp); + ret = boost::shared_ptr (new MidiRegion (srcs)); + } if (ret) { - - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -240,6 +226,9 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -260,22 +249,15 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) if (srcs[0]->type() == DataType::AUDIO) { - AudioRegion* ar = new AudioRegion (srcs); - boost_debug_shared_ptr_mark_interesting (ar, "Region"); - - boost::shared_ptr arp (ar); - ret = boost::static_pointer_cast (arp); + ret = boost::shared_ptr (new AudioRegion (srcs)); } else if (srcs[0]->type() == DataType::MIDI) { - MidiRegion* mr = new MidiRegion (srcs); + ret = boost::shared_ptr (new MidiRegion (srcs)); - boost::shared_ptr mrp (mr); - ret = boost::static_pointer_cast (mrp); } if (ret) { - if (ret->set_state (node, Stateful::loading_state_version)) { ret.reset (); } else { @@ -284,10 +266,12 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node) } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } - void RegionFactory::map_add (boost::shared_ptr r) { @@ -295,23 +279,49 @@ RegionFactory::map_add (boost::shared_ptr r) p.first = r->id(); p.second = r; - { - Glib::Mutex::Lock lm (region_map_lock); - region_map.insert (p); - /* we pay no attention to attempts to delete regions */ - } + { + Glib::Mutex::Lock lm (region_map_lock); + region_map.insert (p); + } + + r->DropReferences.connect_same_thread (region_list_connections, boost::bind (&RegionFactory::map_remove, r)); + + r->PropertyChanged.connect_same_thread ( + region_list_connections, + boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr (r)) + ); + + update_region_name_map (r); } void RegionFactory::map_remove (boost::shared_ptr r) { - { - Glib::Mutex::Lock lm (region_map_lock); - RegionMap::iterator i = region_map.find (r->id()); - if (i != region_map.end()) { - region_map.erase (i); - } - } + Glib::Mutex::Lock lm (region_map_lock); + RegionMap::iterator i = region_map.find (r->id()); + + if (i != region_map.end()) { + region_map.erase (i); + } +} + +void +RegionFactory::map_remove_with_equivalents (boost::shared_ptr r) +{ + Glib::Mutex::Lock lm (region_map_lock); + + for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ) { + RegionMap::iterator tmp = i; + ++tmp; + + if (r->region_list_equivalent (i->second)) { + region_map.erase (i); + } else if (r == i->second) { + region_map.erase (i); + } + + i = tmp; + } } boost::shared_ptr @@ -320,15 +330,234 @@ RegionFactory::region_by_id (const PBD::ID& id) RegionMap::iterator i = region_map.find (id); if (i == region_map.end()) { - cerr << "ID " << id << " not found in region map\n"; return boost::shared_ptr(); } return i->second; } - + +boost::shared_ptr +RegionFactory::wholefile_region_by_name (const std::string& name) +{ + for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { + if (i->second->whole_file() && i->second->name() == name) { + return i->second; + } + } + return boost::shared_ptr(); +} + +boost::shared_ptr +RegionFactory::region_by_name (const std::string& name) +{ + for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { + if (i->second->name() == name) { + return i->second; + } + } + return boost::shared_ptr(); +} + void RegionFactory::clear_map () { - region_map.clear (); + region_list_connections.drop_connections (); + + { + Glib::Mutex::Lock lm (region_map_lock); + region_map.clear (); + } + +} + +void +RegionFactory::delete_all_regions () +{ + RegionMap copy; + + /* copy region list */ + { + Glib::Mutex::Lock lm (region_map_lock); + copy = region_map; + } + + /* clear existing map */ + clear_map (); + + /* tell everyone to drop references */ + for (RegionMap::iterator i = copy.begin(); i != copy.end(); ++i) { + i->second->drop_references (); + } + + /* the copy should now hold the only references, which will + vanish as we leave this scope, thus calling all destructors. + */ +} + +uint32_t +RegionFactory::nregions () +{ + Glib::Mutex::Lock lm (region_map_lock); + return region_map.size (); +} + +void +RegionFactory::update_region_name_map (boost::shared_ptr region) +{ + string::size_type const last_period = region->name().find_last_of ('.'); + + if (last_period != string::npos && last_period < region->name().length() - 1) { + + string const base = region->name().substr (0, last_period); + string const number = region->name().substr (last_period + 1); + + /* note that if there is no number, we get zero from atoi, + which is just fine + */ + + Glib::Mutex::Lock lm (region_name_map_lock); + region_name_map[base] = atoi (number.c_str ()); + } +} + +void +RegionFactory::region_changed (PropertyChange const & what_changed, boost::weak_ptr w) +{ + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + if (what_changed.contains (Properties::name)) { + update_region_name_map (r); + } +} + +int +RegionFactory::region_name (string& result, string base, bool newlevel) +{ + char buf[16]; + string subbase; + + if (base.find("/") != string::npos) { + base = base.substr(base.find_last_of("/") + 1); + } + + if (base == "") { + + snprintf (buf, sizeof (buf), "%d", RegionFactory::nregions() + 1); + result = "region."; + result += buf; + + } else { + + if (newlevel) { + subbase = base; + } else { + string::size_type pos; + + pos = base.find_last_of ('.'); + + /* pos may be npos, but then we just use entire base */ + + subbase = base.substr (0, pos); + + } + + { + Glib::Mutex::Lock lm (region_name_map_lock); + + map::iterator x; + + result = subbase; + + if ((x = region_name_map.find (subbase)) == region_name_map.end()) { + result += ".1"; + region_name_map[subbase] = 1; + } else { + x->second++; + snprintf (buf, sizeof (buf), ".%d", x->second); + + result += buf; + } + } + } + + return 0; +} + +string +RegionFactory::new_region_name (string old) +{ + string::size_type last_period; + uint32_t number; + string::size_type len = old.length() + 64; + char buf[len]; + + if ((last_period = old.find_last_of ('.')) == string::npos) { + + /* no period present - add one explicitly */ + + old += '.'; + last_period = old.length() - 1; + number = 0; + + } else { + + number = atoi (old.substr (last_period+1).c_str()); + + } + + while (number < (UINT_MAX-1)) { + + const RegionMap& regions (RegionFactory::regions()); + RegionMap::const_iterator i; + string sbuf; + + number++; + + snprintf (buf, len, "%s%" PRIu32, old.substr (0, last_period + 1).c_str(), number); + sbuf = buf; + + for (i = regions.begin(); i != regions.end(); ++i) { + if (i->second->name() == sbuf) { + break; + } + } + + if (i == regions.end()) { + break; + } + } + + if (number != (UINT_MAX-1)) { + return buf; + } + + error << string_compose (_("cannot create new name for region \"%1\""), old) << endmsg; + return old; +} + +void +RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set >& r) +{ + Glib::Mutex::Lock lm (region_map_lock); + + for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { + if (i->second->uses_source (s)) { + r.insert (i->second); + } + } +} + +void +RegionFactory::remove_regions_using_source (boost::shared_ptr src) +{ + Glib::Mutex::Lock lm (region_map_lock); + + for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { + if (i->second->uses_source (src)) { + region_map.erase (i); + } + } }