X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion_factory.cc;h=33c714cd1d80c8d3bb337e9f448cf5a7b528865a;hb=3aade3801d5ff2c8314eefc4375475f46e913fac;hp=a8b0d436d64ac0334ac0cb8d8ebe5f6a1baa19de;hpb=7b2975244165b4ffd1dcf4080c1be4c8dcbc6708;p=ardour.git diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index a8b0d436d6..33c714cd1d 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -17,36 +17,36 @@ */ -#define __STDC_FORMAT_MACROS #include +#include "pbd/basename.h" #include "pbd/error.h" -#include "pbd/boost_debug.h" -#include "ardour/session.h" - -#include "ardour/region_factory.h" -#include "ardour/region.h" #include "ardour/audioregion.h" #include "ardour/audiosource.h" -#include "ardour/midi_source.h" #include "ardour/midi_region.h" -#include "ardour/utils.h" +#include "ardour/midi_source.h" +#include "ardour/region.h" +#include "ardour/region_factory.h" +#include "ardour/session.h" #include "i18n.h" using namespace ARDOUR; using namespace PBD; +using namespace std; PBD::Signal1 > RegionFactory::CheckNewRegion; -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; +Glib::Threads::Mutex RegionFactory::region_map_lock; +RegionFactory::RegionMap RegionFactory::region_map; +PBD::ScopedConnectionList* RegionFactory::region_list_connections = 0; +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 -RegionFactory::create (boost::shared_ptr region) +RegionFactory::create (boost::shared_ptr region, bool announce) { boost::shared_ptr ret; boost::shared_ptr ar; @@ -54,48 +54,96 @@ 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); + if (mr->session().config.get_midi_copy_is_fork()) { + /* What we really want to do here is what Editor::fork_region() + does via Session::create_midi_source_by_stealing_name(), but we + don't have a Track. We'll just live with the skipped number, + and store the ancestral name of sources so multiple clones + generates reasonable names that don't have too many suffixes. */ + const std::string ancestor_name = mr->sources().front()->ancestor_name(); + const std::string base = PBD::basename_nosuffix(ancestor_name); + + boost::shared_ptr source = mr->session().create_midi_source_for_session(base); + source->set_ancestor_name(mr->sources().front()->name()); + ret = mr->clone(source); + } else { + ret = boost::shared_ptr (new MidiRegion (mr, 0)); + } } else { fatal << _("programming error: RegionFactory::create() called with unknown Region type") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if (ret) { - map_add (ret); + ret->set_name (new_region_name(ret->name())); + ret->set_position (region->position()); + + if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { + ret->set_position_lock_style (MusicTime); + } /* pure copy constructor - no property list */ - /* pure copy constructor - no CheckNewRegion emitted */ + if (announce) { + map_add (ret); + 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) -{ - return create (region, offset, true, plist, announce); -} - boost::shared_ptr RegionFactory::create (boost::shared_ptr region, const PropertyList& plist, bool announce) { - return create (region, 0, false, plist, announce); + boost::shared_ptr ret; + boost::shared_ptr other_a; + boost::shared_ptr other_m; + + if ((other_a = boost::dynamic_pointer_cast(region)) != 0) { + + ret = boost::shared_ptr (new AudioRegion (other_a)); + + } else if ((other_m = boost::dynamic_pointer_cast(region)) != 0) { + + ret = boost::shared_ptr (new MidiRegion (other_m)); + + } else { + fatal << _("programming error: RegionFactory::create() called with unknown Region type") + << endmsg; + abort(); /*NOTREACHED*/ + return boost::shared_ptr(); + } + + if (ret) { + ret->apply_changes (plist); + + if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { + ret->set_position_lock_style (MusicTime); + } + + if (announce) { + map_add (ret); + 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, bool offset_relative, 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; @@ -103,34 +151,35 @@ RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, b if ((other_a = boost::dynamic_pointer_cast(region)) != 0) { - AudioRegion* ar = new AudioRegion (other_a, offset, offset_relative); - 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, offset, offset_relative); - 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") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ return boost::shared_ptr(); } if (ret) { ret->apply_changes (plist); - map_add (ret); + + if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { + ret->set_position_lock_style (MusicTime); + } if (announce) { + map_add (ret); CheckNewRegion (ret); } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -147,31 +196,32 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, if ((other = boost::dynamic_pointer_cast(region)) != 0) { // 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") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } if (ret) { - ret->apply_changes (plist); - map_add (ret); + + if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { + ret->set_position_lock_style (MusicTime); + } if (announce) { + map_add (ret); CheckNewRegion (ret); } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; - } boost::shared_ptr @@ -185,36 +235,36 @@ RegionFactory::create (boost::shared_ptr src, const PropertyList& plist, boost::shared_ptr RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool announce) { - boost::shared_ptr ret; + boost::shared_ptr ret; boost::shared_ptr as; boost::shared_ptr ms; 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->apply_changes (plist); - map_add (ret); + + if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) { + ret->set_position_lock_style (MusicTime); + } if (announce) { + map_add (ret); CheckNewRegion (ret); } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -235,30 +285,31 @@ 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); - boost::shared_ptr mrp (mr); - ret = boost::static_pointer_cast (mrp); + ret = boost::shared_ptr (new MidiRegion (srcs)); + } if (ret) { - if (ret->set_state (node, Stateful::loading_state_version)) { ret.reset (); } else { map_add (ret); + + /* Don't fiddle with position_lock_style here as the region + description is coming from XML. + */ + CheckNewRegion (ret); } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + // boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -269,52 +320,36 @@ 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); - } - - 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); -} + { + Glib::Threads::Mutex::Lock lm (region_map_lock); + region_map.insert (p); + } -void -RegionFactory::map_remove (boost::shared_ptr r) -{ - Glib::Mutex::Lock lm (region_map_lock); - RegionMap::iterator i = region_map.find (r->id()); + if (!region_list_connections) { + region_list_connections = new ScopedConnectionList; + } - if (i != region_map.end()) { - region_map.erase (i); - } + 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))); + add_to_region_name_maps (r); } void -RegionFactory::map_remove_with_equivalents (boost::shared_ptr r) +RegionFactory::map_remove (boost::weak_ptr w) { - 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 r = w.lock (); + if (!r) { + return; + } + 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); + } } boost::shared_ptr @@ -323,58 +358,123 @@ 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_list_connections.drop_connections (); - - { - Glib::Mutex::Lock lm (region_map_lock); - region_map.clear (); - } + if (region_list_connections) { + region_list_connections->drop_connections (); + } + { + Glib::Threads::Mutex::Lock lm (region_map_lock); + region_map.clear (); + _compound_associations.clear (); + region_name_map.clear (); + } } void RegionFactory::delete_all_regions () { - RegionMap copy; + RegionMap copy; - /* copy region list */ - { - Glib::Mutex::Lock lm (region_map_lock); - copy = region_map; - } + /* copy region list */ + { + Glib::Threads::Mutex::Lock lm (region_map_lock); + copy = region_map; + } - /* clear existing map */ - clear_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 (); - } + /* 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. - */ + /* 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 (); + Glib::Threads::Mutex::Lock lm (region_map_lock); + return region_map.size (); +} + +/** Add a region to the two region name maps */ +void +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::update_region_name_map (boost::shared_ptr region) +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 ('.'); @@ -387,8 +487,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 ()); } } @@ -401,7 +501,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); } } @@ -437,15 +537,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); @@ -458,13 +558,24 @@ RegionFactory::region_name (string& result, string base, bool newlevel) return 0; } +string +RegionFactory::compound_region_name (const string& playlist, uint32_t compound_ops, uint32_t depth, bool whole_source) +{ + if (whole_source) { + return string_compose (_("%1 compound-%2 (%3)"), playlist, compound_ops+1, depth+1); + } else { + return string_compose (_("%1 compound-%2.1 (%3)"), playlist, compound_ops+1, depth+1); + } +} + 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]; + string remainder; + std::vector buf(len); if ((last_period = old.find_last_of ('.')) == string::npos) { @@ -476,48 +587,84 @@ RegionFactory::new_region_name (string old) } else { - number = atoi (old.substr (last_period+1).c_str()); + if (last_period < old.length() - 1) { + + string period_to_end = old.substr (last_period+1); + + /* extra material after the period */ + + string::size_type numerals_end = period_to_end.find_first_not_of ("0123456789"); + number = atoi (period_to_end); + + if (numerals_end < period_to_end.length() - 1) { + /* extra material after the end of the digits */ + remainder = period_to_end.substr (numerals_end); + } + + } else { + last_period = old.length(); + number = 0; + } } 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; + snprintf (&buf[0], len, "%s%" PRIu32 "%s", old.substr (0, last_period + 1).c_str(), number, remainder.c_str()); + sbuf = &buf[0]; - 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; } } if (number != (UINT_MAX-1)) { - return buf; + return &buf[0]; } error << string_compose (_("cannot create new name for region \"%1\""), old) << endmsg; return old; } -void +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)) { + r.insert (i->second); + } + } +} + +void +RegionFactory::remove_regions_using_source (boost::shared_ptr src) +{ + Glib::Threads::Mutex::Lock lm (region_map_lock); + + RegionMap::iterator i = region_map.begin(); + while (i != region_map.end()) { - for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) { - if (i->second->uses_source (s)) { - r.insert (i->second); + RegionMap::iterator j = i; + ++j; + + if (i->second->uses_source (src)) { + remove_from_region_name_map (i->second->name ()); + region_map.erase (i); } - } + + i = j; + } +} + +void +RegionFactory::add_compound_association (boost::shared_ptr orig, boost::shared_ptr copy) +{ + Glib::Threads::Mutex::Lock lm (region_map_lock); + _compound_associations[copy] = orig; }