don't add regions created with announce=false to the global region map. i hope this...
authorPaul Davis <paul@linuxaudiosystems.com>
Sun, 27 May 2012 18:08:03 +0000 (18:08 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Sun, 27 May 2012 18:08:03 +0000 (18:08 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@12457 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/region_factory.cc

index 01860048f4e6c000156aeaac6bb2bfcd3276f8e7..fa948844abcf2adc224127a03b1115fc5f8eb555 100644 (file)
@@ -75,11 +75,10 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce)
                if (ret->session().config.get_glue_new_regions_to_bars_and_beats ()) {
                        ret->set_position_lock_style (MusicTime);
                }
-               
-               map_add (ret);
 
                /* pure copy constructor - no property list */
                if (announce) {
+                       map_add (ret);
                        CheckNewRegion (ret);
                }
        }
@@ -119,9 +118,8 @@ RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& pli
                        ret->set_position_lock_style (MusicTime);
                }
                
-               map_add (ret);
-
                if (announce) {
+                       map_add (ret);
                        CheckNewRegion (ret);
                }
        }
@@ -161,9 +159,8 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, c
                        ret->set_position_lock_style (MusicTime);
                }
 
-               map_add (ret);
-
                if (announce) {
+                       map_add (ret);
                        CheckNewRegion (ret);
                }
        }
@@ -203,9 +200,8 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
                        ret->set_position_lock_style (MusicTime);
                }
 
-               map_add (ret);
-
                if (announce) {
+                       map_add (ret);
                        CheckNewRegion (ret);
                }
        }
@@ -248,9 +244,8 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
                        ret->set_position_lock_style (MusicTime);
                }
                
-               map_add (ret);
-
                if (announce) {
+                       map_add (ret);
                        CheckNewRegion (ret);
                }
        }