#include <inttypes.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"
PBD::Signal1<void,boost::shared_ptr<Region> > 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<std::string, uint32_t> RegionFactory::region_name_map;
+PBD::ScopedConnectionList* RegionFactory::region_list_connections = 0;
+Glib::StaticMutex RegionFactory::region_name_maps_mutex;
+std::map<std::string, uint32_t> RegionFactory::region_name_number_map;
+std::map<std::string, PBD::ID> RegionFactory::region_name_map;
RegionFactory::CompoundAssociations RegionFactory::_compound_associations;
boost::shared_ptr<Region>
if (ret) {
ret->set_name (new_region_name(ret->name()));
- map_add (ret);
+ 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 */
if (announce) {
+ map_add (ret);
CheckNewRegion (ret);
}
}
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);
}
}
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);
}
}
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);
}
}
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);
}
}
ret.reset ();
} else {
map_add (ret);
+
+ /* Don't fiddle with position_lock_style here as the region
+ description is coming from XML.
+ */
+
CheckNewRegion (ret);
}
}
region_map.insert (p);
}
- r->DropReferences.connect_same_thread (region_list_connections, boost::bind (&RegionFactory::map_remove, r));
+ if (!region_list_connections) {
+ region_list_connections = new ScopedConnectionList;
+ }
- r->PropertyChanged.connect_same_thread (
- region_list_connections,
- boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr<Region> (r))
- );
+ r->DropReferences.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::map_remove, boost::weak_ptr<Region> (r)));
+ r->PropertyChanged.connect_same_thread (*region_list_connections, boost::bind (&RegionFactory::region_changed, _1, boost::weak_ptr<Region> (r)));
- update_region_name_map (r);
+ add_to_region_name_maps (r);
}
void
-RegionFactory::map_remove (boost::shared_ptr<Region> r)
+RegionFactory::map_remove (boost::weak_ptr<Region> w)
{
+ boost::shared_ptr<Region> r = w.lock ();
+ if (!r) {
+ return;
+ }
+
Glib::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);
}
}
-void
-RegionFactory::map_remove_with_equivalents (boost::shared_ptr<Region> r)
-{
- 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<Region>
RegionFactory::region_by_id (const PBD::ID& id)
{
void
RegionFactory::clear_map ()
{
- region_list_connections.drop_connections ();
+ if (region_list_connections) {
+ region_list_connections->drop_connections ();
+ }
{
Glib::Mutex::Lock lm (region_map_lock);
region_map.clear ();
_compound_associations.clear ();
+ region_name_map.clear ();
}
}
return region_map.size ();
}
+/** Add a region to the two region name maps */
+void
+RegionFactory::add_to_region_name_maps (boost::shared_ptr<Region> region)
+{
+ update_region_name_number_map (region);
+
+ Glib::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::rename_in_region_name_maps (boost::shared_ptr<Region> region)
+{
+ update_region_name_number_map (region);
+
+ Glib::Mutex::Lock lm (region_name_maps_mutex);
+
+ map<string, PBD::ID>::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<string, PBD::ID>::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_map (boost::shared_ptr<Region> region)
+RegionFactory::update_region_name_number_map (boost::shared_ptr<Region> region)
{
string::size_type const last_period = region->name().find_last_of ('.');
which is just fine
*/
- Glib::Mutex::Lock lm (region_name_map_lock);
- region_name_map[base] = atoi (number.c_str ());
+ Glib::Mutex::Lock lm (region_name_maps_mutex);
+ region_name_number_map[base] = atoi (number.c_str ());
}
}
}
if (what_changed.contains (Properties::name)) {
- update_region_name_map (r);
+ rename_in_region_name_maps (r);
}
}
}
{
- Glib::Mutex::Lock lm (region_name_map_lock);
+ Glib::Mutex::Lock lm (region_name_maps_mutex);
map<string,uint32_t>::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);
while (number < (UINT_MAX-1)) {
- const RegionMap& regions (RegionFactory::regions());
- RegionMap::const_iterator i;
string sbuf;
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) {
- if (i->second->name() == sbuf) {
- break;
- }
- }
-
- if (i == regions.end()) {
+ if (region_name_map.find (sbuf) == region_name_map.end ()) {
break;
}
}
{
Glib::Mutex::Lock lm (region_map_lock);
- for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) {
+ RegionMap::iterator i = region_map.begin();
+ while (i != region_map.end()) {
+
+ 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;
}
}
projects / ardour.git / blobdiff