use AudioEngine destructor to do necessary stuff when shutting it down, and remove...

[ardour.git] / libs / ardour / ardour / region_factory.h

diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h
index 4ba261f80c8c3a3981f2236a42237471f326b750..ed0c962d879a7adae199e410b830a56d574e6984 100644 (file)
--- a/libs/ardour/ardour/region_factory.h
+++ b/libs/ardour/ardour/region_factory.h
@@ -22,7 +22,7 @@
 
 #include <map>
 #include <set>
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/id.h"
 #include "pbd/property_list.h"
@@ -31,6 +31,7 @@
 #include "ardour/types.h"
 
 class XMLNode;
+class RegionNamingTest;
 
 namespace ARDOUR {
 
@@ -119,17 +120,23 @@ public:
        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 Glib::Threads::Mutex region_map_lock;
 
        static RegionMap region_map;
 
-       static Glib::StaticMutex region_name_map_lock;
-
-       static std::map<std::string, uint32_t> region_name_map;
-       static void update_region_name_map (boost::shared_ptr<Region>);
+       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;