check dependents in Playlist after moving a region to a specific layer; make region layering editor appear reliably; click on xfade sets clicked_routeview

git-svn-id: svn://localhost/ardour2/branches/3.0@7692 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 7 insertions, 4 deletions

diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc
index 30e52fa316..cfc5a4028a 100644
--- a/libs/ardour/audio_playlist.cc
+++ b/libs/ardour/audio_playlist.cc
@@ -399,7 +399,7 @@ AudioPlaylist::check_dependents (boost::shared_ptr<Region> r, bool norefresh)
 		touched_regions = 0;
 
 		try {
-			nframes_t xfade_length;
+			framecnt_t xfade_length;
 			switch (c) {
 			case OverlapNone:
 				break;
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc
index 9c980ff735..93a4d520e8 100644
--- a/libs/ardour/playlist.cc
+++ b/libs/ardour/playlist.cc
@@ -2603,6 +2603,8 @@ Playlist::move_region_to_layer (layer_t target_layer, boost::shared_ptr<Region>
 		}
 	}
 
+        freeze ();
+
 	/* now reset the layers without holding the region lock */
 
 	for (list<LayerInfo>::iterator x = layerinfo.begin(); x != layerinfo.end(); ++x) {
@@ -2611,15 +2613,16 @@ Playlist::move_region_to_layer (layer_t target_layer, boost::shared_ptr<Region>
 
 	region->set_layer (target_layer);
 
-#if 0
-	/* now check all dependents */
+        /* now check all dependents, since we changed the layering */
 
 	for (list<LayerInfo>::iterator x = layerinfo.begin(); x != layerinfo.end(); ++x) {
 		check_dependents (x->first, false);
 	}
 
 	check_dependents (region, false);
-#endif
+        notify_layering_changed ();
+
+        thaw ();
 
 	return 0;
 }