X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fregion_factory.h;h=c661fed019ee8a9451f4310b438bdb9ff6fd919b;hb=8a4518d76fe78e5fb99900ff5ff71a22e5912395;hp=647e1fe7d8b9f3b509a0a8d46500c2e29d211b5a;hpb=b37b23af97fbffbf789222f03247439324648ffb;p=ardour.git diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 647e1fe7d8..c661fed019 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -22,21 +22,24 @@ #include #include -#include +#include #include "pbd/id.h" +#include "pbd/property_list.h" #include "pbd/signals.h" +#include "ardour/libardour_visibility.h" #include "ardour/types.h" class XMLNode; +class RegionNamingTest; namespace ARDOUR { class Session; class AudioRegion; -class RegionFactory { +class LIBARDOUR_API RegionFactory { public: typedef std::map > RegionMap; @@ -56,24 +59,28 @@ public: static PBD::Signal1 > CheckNewRegion; /** create a "pure copy" of Region @param other */ - static boost::shared_ptr create (boost::shared_ptr other, bool announce = false); + static boost::shared_ptr create (boost::shared_ptr other, bool announce = false, bool fork = false); + static boost::shared_ptr create (boost::shared_ptr other, bool announce, bool fork) { + return create (boost::shared_ptr(other), announce, fork); + } /** create a region from a single Source */ - static boost::shared_ptr create (boost::shared_ptr, + static boost::shared_ptr create (boost::shared_ptr, const PBD::PropertyList&, bool announce = true); + /** create a region from a multiple sources */ - static boost::shared_ptr create (const SourceList &, + static boost::shared_ptr create (const SourceList &, const PBD::PropertyList&, bool announce = true); /** create a copy of @other starting at zero within @param other's sources */ - static boost::shared_ptr create (boost::shared_ptr other, + static boost::shared_ptr create (boost::shared_ptr other, const PBD::PropertyList&, bool announce = true); /** create a copy of @param other starting at @param offset within @param other */ - static boost::shared_ptr create (boost::shared_ptr other, frameoffset_t offset, + static boost::shared_ptr create (boost::shared_ptr other, ARDOUR::MusicSample offset, const PBD::PropertyList&, bool announce = true); /** create a "copy" of @param other but using a different set of sources @param srcs */ - static boost::shared_ptr create (boost::shared_ptr other, const SourceList& srcs, + static boost::shared_ptr create (boost::shared_ptr other, const SourceList& srcs, const PBD::PropertyList&, bool announce = true); - + /** create a region with no sources, using XML state */ static boost::shared_ptr create (Session&, XMLNode&, bool); /** create a region with specified sources @param srcs and XML state */ @@ -82,30 +89,61 @@ public: static void get_regions_using_source (boost::shared_ptr, std::set >& ); static void remove_regions_using_source (boost::shared_ptr); - static void map_remove (boost::shared_ptr); - static void map_remove_with_equivalents (boost::shared_ptr); + static void map_remove (boost::weak_ptr); static void delete_all_regions (); static const RegionMap& regions() { return region_map; } static uint32_t nregions (); static int region_name (std::string &, std::string, bool new_level = false); static std::string new_region_name (std::string); - + static std::string compound_region_name (const std::string& playlist, uint32_t compound_ops, uint32_t depth, bool whole_source); + + /* when we make a compound region, for every region involved there + * are two "instances" - the original, which is removed from this + * playlist, and a copy, which is added to the playlist used as + * the source for the compound. + * + * when we uncombine, we want to put the originals back into this + * playlist after we remove the compound. this map lets us + * look them up easily. note that if the compound was trimmed or + * split, we may have to trim the originals + * and they may not be added back if the compound was trimmed + * or split sufficiently. + */ + + typedef std::map, boost::shared_ptr > CompoundAssociations; + static CompoundAssociations& compound_associations() { return _compound_associations; } + + static void add_compound_association (boost::shared_ptr, boost::shared_ptr); + + /* exposed because there may be cases where regions are created with + * announce=false but they still need to be in the map soon after + * creation. + */ + + static void map_add (boost::shared_ptr); + private: + friend class ::RegionNamingTest; static void region_changed (PBD::PropertyChange const &, boost::weak_ptr); - - static Glib::StaticMutex region_map_lock; - - static RegionMap region_map; - static void map_add (boost::shared_ptr); - static Glib::StaticMutex region_name_map_lock; + static Glib::Threads::Mutex region_map_lock; - static std::map region_name_map; - static void update_region_name_map (boost::shared_ptr); + static RegionMap region_map; - static PBD::ScopedConnectionList region_list_connections; + static Glib::Threads::Mutex region_name_maps_mutex; + /** map of partial region names and suffix numbers */ + static std::map region_name_number_map; + /** map of complete region names with their region ID */ + static std::map region_name_map; + static void add_to_region_name_maps (boost::shared_ptr); + static void rename_in_region_name_maps (boost::shared_ptr); + static void update_region_name_number_map (boost::shared_ptr); + static void remove_from_region_name_map (std::string); + + static PBD::ScopedConnectionList* region_list_connections; + static CompoundAssociations _compound_associations; }; }