X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fregion_factory.cc;h=8b2d30d511cc485603958fc3db3d316018b67569;hb=7b94110c545415af8437fc6631e7663ebb5c28f3;hp=004321fa9e06a55d9862641b471a35ba498004f1;hpb=86f24d20e1616ffaafc97de65db49fd6a91270f8;p=ardour.git

diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc
index 004321fa9e..8b2d30d511 100644
--- a/libs/ardour/region_factory.cc
+++ b/libs/ardour/region_factory.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2006 Paul Davis 
+    Copyright (C) 2000-2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -36,8 +36,8 @@ using namespace PBD;
 sigc::signal<void,boost::shared_ptr<Region> > RegionFactory::CheckNewRegion;
 
 boost::shared_ptr<Region>
-RegionFactory::create (boost::shared_ptr<Region> region, nframes_t start, 
-		       nframes_t length, const std::string& name, 
+RegionFactory::create (boost::shared_ptr<Region> region, nframes_t start,
+		       nframes_t length, const std::string& name,
 		       layer_t layer, Region::Flag flags, bool announce)
 {
 	boost::shared_ptr<const AudioRegion> other_a;
@@ -94,8 +94,8 @@ RegionFactory::create (boost::shared_ptr<const Region> region)
 }
 
 boost::shared_ptr<Region>
-RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start, 
-		       nframes_t length, const std::string& name, 
+RegionFactory::create (boost::shared_ptr<AudioRegion> region, nframes_t start,
+		       nframes_t length, const std::string& name,
 		       layer_t layer, Region::Flag flags, bool announce)
 {
 	return create (boost::static_pointer_cast<Region> (region), start, length, name, layer, flags, announce);
@@ -133,16 +133,16 @@ boost::shared_ptr<Region>
 RegionFactory::create (Session& session, XMLNode& node, bool yn)
 {
 	boost::shared_ptr<Region> r = session.XMLRegionFactory (node, yn);
-	r->unlock_property_changes ();
 
 	if (r) {
+		r->unlock_property_changes ();
 		CheckNewRegion (r);
 	}
 
 	return r;
 }
-	
-boost::shared_ptr<Region> 
+
+boost::shared_ptr<Region>
 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()) {
@@ -150,7 +150,7 @@ RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length
 	}
 
 	if (srcs[0]->type() == DataType::AUDIO) {
-		
+
 		AudioRegion* ar = new AudioRegion (srcs, start, length, name, layer, flags);
 		boost::shared_ptr<AudioRegion> arp (ar);
 		boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (arp));
@@ -161,7 +161,7 @@ RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length
 		return ret;
 
 	} else if (srcs[0]->type() == DataType::MIDI) {
-		
+
 		MidiRegion* ar = new MidiRegion (srcs, start, length, name, layer, flags);
 		boost::shared_ptr<MidiRegion> mrp (ar);
 		boost::shared_ptr<Region> ret (boost::static_pointer_cast<Region> (mrp));
@@ -174,9 +174,9 @@ RegionFactory::create (const SourceList& srcs, nframes_t start, nframes_t length
 	}
 
 	return boost::shared_ptr<Region> ();
-}	
+}
 
-boost::shared_ptr<Region> 
+boost::shared_ptr<Region>
 RegionFactory::create (SourceList& srcs, const XMLNode& node)
 {
 	if (srcs.empty()) {
@@ -198,7 +198,7 @@ RegionFactory::create (SourceList& srcs, const XMLNode& node)
 	return boost::shared_ptr<Region> ();
 }
 
-boost::shared_ptr<Region> 
+boost::shared_ptr<Region>
 RegionFactory::create (boost::shared_ptr<Source> src, nframes_t start, nframes_t length, const string& name, layer_t layer, Region::Flag flags, bool announce)
 {
 	boost::shared_ptr<AudioSource> as;