X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion_factory.cc;h=3ca33cac0119905a2c755b52fabfbc55039c2a69;hb=a5efa9a500d2c1b592656e91e9ea7ef7d535dcb3;hp=459f993676843d8d8cb4217c3a60bb0e6c91e458;hpb=7e3404e2a0174d5b7b208695e57f230a174c1379;p=ardour.git diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index 459f993676..3ca33cac01 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 RegionFactory::region_name_map; +RegionFactory::CompoundAssociations RegionFactory::_compound_associations; boost::shared_ptr RegionFactory::create (boost::shared_ptr region, bool announce) @@ -53,17 +54,11 @@ RegionFactory::create (boost::shared_ptr region, bool announce) 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") @@ -76,30 +71,56 @@ RegionFactory::create (boost::shared_ptr region, bool announce) 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) -{ - 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; + /*NOTREACHED*/ + return boost::shared_ptr(); + } + + if (ret) { + ret->apply_changes (plist); + map_add (ret); + + 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, 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; @@ -107,17 +128,11 @@ 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") @@ -135,6 +150,9 @@ RegionFactory::create (boost::shared_ptr region, frameoffset_t offset, b } } +#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS + boost_debug_shared_ptr_mark_interesting (ret.get(), "Region"); +#endif return ret; } @@ -151,12 +169,8 @@ 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") @@ -165,7 +179,6 @@ RegionFactory::create (boost::shared_ptr region, const SourceList& srcs, } if (ret) { - ret->apply_changes (plist); map_add (ret); @@ -174,8 +187,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 @@ -189,28 +204,21 @@ 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); @@ -219,6 +227,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; } @@ -239,22 +250,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); - 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 { @@ -263,6 +267,9 @@ 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; } @@ -273,7 +280,7 @@ 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); } @@ -312,7 +319,7 @@ RegionFactory::map_remove_with_equivalents (boost::shared_ptr r) region_map.erase (i); } else if (r == i->second) { region_map.erase (i); - } + } i = tmp; } @@ -339,7 +346,7 @@ RegionFactory::wholefile_region_by_name (const std::string& name) } } return boost::shared_ptr(); -} +} boost::shared_ptr RegionFactory::region_by_name (const std::string& name) @@ -350,7 +357,7 @@ RegionFactory::region_by_name (const std::string& name) } } return boost::shared_ptr(); -} +} void RegionFactory::clear_map () @@ -360,8 +367,8 @@ RegionFactory::clear_map () { Glib::Mutex::Lock lm (region_map_lock); region_map.clear (); + _compound_associations.clear (); } - } void @@ -387,7 +394,7 @@ RegionFactory::delete_all_regions () vanish as we leave this scope, thus calling all destructors. */ } - + uint32_t RegionFactory::nregions () { @@ -480,12 +487,23 @@ 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; + string remainder; char buf[len]; if ((last_period = old.find_last_of ('.')) == string::npos) { @@ -498,19 +516,36 @@ 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); + 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) { @@ -532,7 +567,7 @@ RegionFactory::new_region_name (string old) return old; } -void +void RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set >& r) { Glib::Mutex::Lock lm (region_map_lock); @@ -543,3 +578,22 @@ RegionFactory::get_regions_using_source (boost::shared_ptr s, std::set 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); + } + } +} + +void +RegionFactory::add_compound_association (boost::shared_ptr orig, boost::shared_ptr copy) +{ + Glib::Mutex::Lock lm (region_map_lock); + _compound_associations[copy] = orig; +}