#include <map>
#include <set>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
#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<PBD::ID,boost::shared_ptr<Region> > RegionMap;
static PBD::Signal1<void,boost::shared_ptr<Region> > CheckNewRegion;
/** create a "pure copy" of Region @param other */
- static boost::shared_ptr<Region> create (boost::shared_ptr<const Region> other, bool announce = false);
+ static boost::shared_ptr<Region> create (boost::shared_ptr<const Region> other, bool announce = false, const int32_t sub_num = 0);
/** create a region from a single Source */
- static boost::shared_ptr<Region> create (boost::shared_ptr<Source>,
+ static boost::shared_ptr<Region> create (boost::shared_ptr<Source>,
const PBD::PropertyList&, bool announce = true);
-
+
/** create a region from a multiple sources */
- static boost::shared_ptr<Region> create (const SourceList &,
+ static boost::shared_ptr<Region> 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<Region> create (boost::shared_ptr<Region> other,
+ static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other,
const PBD::PropertyList&, bool announce = true);
/** create a copy of @param other starting at @param offset within @param other */
- static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, frameoffset_t offset,
- const PBD::PropertyList&, bool announce = true);
+ static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, frameoffset_t offset,
+ const PBD::PropertyList&, bool announce = true, const int32_t sub_num = 0);
/** create a "copy" of @param other but using a different set of sources @param srcs */
- static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, const SourceList& srcs,
+ static boost::shared_ptr<Region> create (boost::shared_ptr<Region> other, const SourceList& srcs,
const PBD::PropertyList&, bool announce = true);
-
+
/** create a region with no sources, using XML state */
static boost::shared_ptr<Region> create (Session&, XMLNode&, bool);
/** create a region with specified sources @param srcs and XML state */
static void get_regions_using_source (boost::shared_ptr<Source>, std::set<boost::shared_ptr<Region> >& );
static void remove_regions_using_source (boost::shared_ptr<Source>);
- static void map_remove (boost::shared_ptr<Region>);
- static void map_remove_with_equivalents (boost::shared_ptr<Region>);
+ static void map_remove (boost::weak_ptr<Region>);
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);
-
+ 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
+ * 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
static CompoundAssociations& compound_associations() { return _compound_associations; }
static void add_compound_association (boost::shared_ptr<Region>, boost::shared_ptr<Region>);
-
+
+ /* 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<Region>);
+
private:
+ friend class ::RegionNamingTest;
static void region_changed (PBD::PropertyChange const &, boost::weak_ptr<Region>);
-
- static Glib::StaticMutex region_map_lock;
-
- static RegionMap region_map;
- static void map_add (boost::shared_ptr<Region>);
- static Glib::StaticMutex region_name_map_lock;
+ static Glib::Threads::Mutex region_map_lock;
- static std::map<std::string, uint32_t> region_name_map;
- static void update_region_name_map (boost::shared_ptr<Region>);
+ 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<std::string, uint32_t> region_name_number_map;
+ /** map of complete region names with their region ID */
+ static std::map<std::string, PBD::ID> region_name_map;
+ static void add_to_region_name_maps (boost::shared_ptr<Region>);
+ static void rename_in_region_name_maps (boost::shared_ptr<Region>);
+ static void update_region_name_number_map (boost::shared_ptr<Region>);
+ static void remove_from_region_name_map (std::string);
+
+ static PBD::ScopedConnectionList* region_list_connections;
static CompoundAssociations _compound_associations;
};
projects / ardour.git / blobdiff