Fix canvas region layering in non-Stacked modes. Remove unused and confusing TimeAxisViewItem::selected .

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

2 files changed, 6 insertions, 6 deletions

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 1be1f7ede5..dd5da01b0f 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -290,9 +290,9 @@ StreamView::layer_regions()
 		i = tmp;
 	}
 
-	// Fix canvas layering by raising each in the sorted list order
+	// Fix canvas layering by raising each to the top in the sorted order.
 	for (RegionViewList::iterator i = copy.begin(); i != copy.end(); ++i) {
-		region_layered (*i);
+		(*i)->get_canvas_group()->raise_to_top ();
 	}
 }
 
@@ -320,7 +320,10 @@ StreamView::playlist_modified (boost::shared_ptr<Diskstream> ds)
 	if (_layer_display == Stacked) {
 		update_contents_height ();
 		update_coverage_frames ();
-	}
+	} else {
+		/* layering has probably been modified. reflect this in the canvas. */
+		layer_regions();
+	} 
 }
 
 void
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index f2d4fba25b..de8d3792db 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -413,9 +413,6 @@ class TimeAxisViewItem : public Selectable
     /** the curretn samples per canvas unit */
     double samples_per_unit ;
 
-    /** indicates if this item is currently selected */
-    bool selected ;
-
     /** should the item show its selected status */
     bool should_show_selection;