Merge with trunk R2978.

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

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index cc41405551d2ba65aaa4265c6dba54594c29c862..bd4b0873a72a6c3b37797be6c3fc0ca937365140 100644 (file)
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -89,24 +89,6 @@ RegionFactory::create (boost::shared_ptr<Region> region)
        }
 }
 
-boost::shared_ptr<Region>
-RegionFactory::create (const Playlist& playlist, boost::shared_ptr<Region> region)
-{
-       boost::shared_ptr<Crossfade> xfade;
-       boost::shared_ptr<MidiRegion> mr;
-       
-       if ((xfade = boost::dynamic_pointer_cast<Crossfade>(region)) != 0) {
-               boost::shared_ptr<Region> ret (new Crossfade (playlist, xfade));
-               /* pure copy constructor - no CheckNewRegion emitted */
-               return ret;
-       } else {
-               fatal << _("programming error: RegionFactory::create(Playlist,Region) called with unknown Region type")
-                     << endmsg;
-               /*NOTREACHED*/
-               return boost::shared_ptr<Region>();
-       }
-}
-
 boost::shared_ptr<Region>
 RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start, 
                             nframes_t length, std::string name, 
@@ -124,7 +106,7 @@ RegionFactory::create (Session& session, XMLNode& node, bool yn)
 }
        
 boost::shared_ptr<Region> 
-RegionFactory::create (SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce)
+RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce)
 {
        if (srcs.empty()) {
                return boost::shared_ptr<Region>();
@@ -155,22 +137,6 @@ RegionFactory::create (SourceList& srcs, nframes_t start, nframes_t length, cons
        return boost::shared_ptr<Region> ();
 }      
 
-boost::shared_ptr<Region> 
-RegionFactory::create (const Playlist& playlist, const XMLNode& node)
-{
-       /* this is a constructor for "dependent" region types.
-          these objects require a playlist so that they can
-          look up the region instances that they depend upon.
-       */
-
-       if (node.name() == Crossfade::node_name()) {
-               boost::shared_ptr<Region> ret (new Crossfade (playlist, node));
-               return ret;
-       }
-
-       return boost::shared_ptr<Region> ();
-}
-
 boost::shared_ptr<Region> 
 RegionFactory::create (SourceList& srcs, const XMLNode& node)
 {