X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fregion_factory.cc;h=eba237d0d208942bbe5aa70c17d7c0ca37f23f69;hb=4fc42bca44651b927d336110c23e789691f3bb48;hp=459f993676843d8d8cb4217c3a60bb0e6c91e458;hpb=7e3404e2a0174d5b7b208695e57f230a174c1379;p=ardour.git

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 459f993676..eba237d0d2 100644
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -53,17 +53,11 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce)
 
 	if ((ar = boost::dynamic_pointer_cast<const AudioRegion>(region)) != 0) {
 
-		AudioRegion* arn = new AudioRegion (ar, 0, true);
-		boost_debug_shared_ptr_mark_interesting (arn, "Region");
-
-		boost::shared_ptr<AudioRegion> arp (arn);
-		ret = boost::static_pointer_cast<Region> (arp);
+		ret = boost::shared_ptr<Region> (new AudioRegion (ar, 0));
 
 	} else if ((mr = boost::dynamic_pointer_cast<const MidiRegion>(region)) != 0) {
 
-		MidiRegion* mrn = new MidiRegion (mr, 0, true);
-		boost::shared_ptr<MidiRegion> mrp (mrn);
-		ret = boost::static_pointer_cast<Region> (mrp);
+		ret = boost::shared_ptr<Region> (new MidiRegion (mr, 0));
 
 	} else {
 		fatal << _("programming error: RegionFactory::create() called with unknown Region type")
@@ -76,30 +70,56 @@ RegionFactory::create (boost::shared_ptr<const Region> region, bool announce)
 		map_add (ret);
 
 		/* pure copy constructor - no property list */
-		/* pure copy constructor - no CheckNewRegion emitted */
 		if (announce) {
 			CheckNewRegion (ret);
 		}
 	}
 
-
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+	boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
 	return ret;
 }
 
-boost::shared_ptr<Region>
-RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, const PropertyList& plist, bool announce)
-{
-	return create (region, offset, true, plist, announce);
-}
-
 boost::shared_ptr<Region>
 RegionFactory::create (boost::shared_ptr<Region> region, const PropertyList& plist, bool announce)
 {
-	return create (region, 0, false, plist, announce);
+	boost::shared_ptr<Region> ret;
+	boost::shared_ptr<const AudioRegion> other_a;
+	boost::shared_ptr<const MidiRegion> other_m;
+
+	if ((other_a = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) {
+
+		ret = boost::shared_ptr<Region> (new AudioRegion (other_a));
+
+	} else if ((other_m = boost::dynamic_pointer_cast<MidiRegion>(region)) != 0) {
+
+		ret = boost::shared_ptr<Region> (new MidiRegion (other_m));
+
+	} else {
+		fatal << _("programming error: RegionFactory::create() called with unknown Region type")
+		      << endmsg;
+		/*NOTREACHED*/
+		return boost::shared_ptr<Region>();
+	}
+
+	if (ret) {
+		ret->apply_changes (plist);
+		map_add (ret);
+
+		if (announce) {
+			CheckNewRegion (ret);
+		}
+	}
+
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS	
+        boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
+	return ret;
 }
 
 boost::shared_ptr<Region>
-RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, bool offset_relative, const PropertyList& plist, bool announce)
+RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, const PropertyList& plist, bool announce)
 {
 	boost::shared_ptr<Region> ret;
 	boost::shared_ptr<const AudioRegion> other_a;
@@ -107,17 +127,11 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, b
 
 	if ((other_a = boost::dynamic_pointer_cast<AudioRegion>(region)) != 0) {
 
-		AudioRegion* ar = new AudioRegion (other_a, offset, offset_relative);
-		boost_debug_shared_ptr_mark_interesting (ar, "Region");
-
-		boost::shared_ptr<AudioRegion> arp (ar);
-		ret = boost::static_pointer_cast<Region> (arp);
-
+		ret = boost::shared_ptr<Region> (new AudioRegion (other_a, offset));
+		
 	} else if ((other_m = boost::dynamic_pointer_cast<MidiRegion>(region)) != 0) {
 
-		MidiRegion* mr = new MidiRegion (other_m, offset, offset_relative);
-		boost::shared_ptr<MidiRegion> mrp (mr);
-		ret = boost::static_pointer_cast<Region> (mrp);
+		ret = boost::shared_ptr<Region> (new MidiRegion (other_m, offset));
 
 	} else {
 		fatal << _("programming error: RegionFactory::create() called with unknown Region type")
@@ -135,6 +149,9 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, b
 		}
 	}
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+	boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
 	return ret;
 }
 
@@ -152,11 +169,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
 
 		// XXX use me in caller where plist is setup, this is start i think srcs.front()->length (srcs.front()->timeline_position())
 		
-		AudioRegion* ar = new AudioRegion (other, srcs);
-		boost_debug_shared_ptr_mark_interesting (ar, "Region");
-
-		boost::shared_ptr<AudioRegion> arp (ar);
-		ret = boost::static_pointer_cast<Region> (arp);
+		ret = boost::shared_ptr<Region> (new AudioRegion (other, srcs));
 
 	} else {
 		fatal << _("programming error: RegionFactory::create() called with unknown Region type")
@@ -165,7 +178,6 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
 	}
 
 	if (ret) {
-
 		ret->apply_changes (plist);
 		map_add (ret);
 
@@ -174,8 +186,10 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs,
 		}
 	}
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS	
+        boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
 	return ret;
-
 }
 
 boost::shared_ptr<Region>
@@ -195,22 +209,15 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
 
 	if ((as = boost::dynamic_pointer_cast<AudioSource>(srcs[0])) != 0) {
 
-		AudioRegion* ar = new AudioRegion (srcs);
-		boost_debug_shared_ptr_mark_interesting (ar, "Region");
-
-		boost::shared_ptr<AudioRegion> arp (ar);
-		ret = boost::static_pointer_cast<Region> (arp);
+		ret = boost::shared_ptr<Region> (new AudioRegion (srcs));
 
 	} else if ((ms = boost::dynamic_pointer_cast<MidiSource>(srcs[0])) != 0) {
-		MidiRegion* mr = new MidiRegion (srcs);
-		boost_debug_shared_ptr_mark_interesting (mr, "Region");
 
-		boost::shared_ptr<MidiRegion> mrp (mr);
-		ret = boost::static_pointer_cast<Region> (mrp);
+		ret = boost::shared_ptr<Region> (new MidiRegion (srcs));
+
 	}
 
 	if (ret) {
-
 		ret->apply_changes (plist);
 		map_add (ret);
 
@@ -219,6 +226,9 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a
 		}
 	}
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+	boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
 	return ret;
 }
 
@@ -239,22 +249,15 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node)
 
 	if (srcs[0]->type() == DataType::AUDIO) {
 
-		AudioRegion* ar = new AudioRegion (srcs);
-		boost_debug_shared_ptr_mark_interesting (ar, "Region");
-
-		boost::shared_ptr<AudioRegion> arp (ar);
-		ret = boost::static_pointer_cast<Region> (arp);
+		ret = boost::shared_ptr<Region> (new AudioRegion (srcs));
 
 	} else if (srcs[0]->type() == DataType::MIDI) {
 		
-		MidiRegion* mr = new MidiRegion (srcs);
+		ret = boost::shared_ptr<Region> (new MidiRegion (srcs));
 
-		boost::shared_ptr<MidiRegion> mrp (mr);
-		ret = boost::static_pointer_cast<Region> (mrp);
 	}
 
 	if (ret) {
-
 		if (ret->set_state (node, Stateful::loading_state_version)) {
 			ret.reset ();
 		} else {
@@ -263,6 +266,9 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node)
 		}
 	}
 
+#ifdef BOOST_SP_ENABLE_DEBUG_HOOKS
+	boost_debug_shared_ptr_mark_interesting (ret.get(), "Region");
+#endif
 	return ret;
 }
 
@@ -543,3 +549,15 @@ RegionFactory::get_regions_using_source (boost::shared_ptr<Source> s, std::set<b
 		}
 	}
 }
+
+void 
+RegionFactory::remove_regions_using_source (boost::shared_ptr<Source> src)
+{
+	Glib::Mutex::Lock lm (region_map_lock);
+
+	for (RegionMap::iterator i = region_map.begin(); i != region_map.end(); ++i) {
+		if (i->second->uses_source (src)) {
+			region_map.erase (i);
+                }
+	}
+}