X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=28905ee45f5a71af84a9870d5235b91e5d8ff56f;hb=fe145ce380074f0e44e722d86ec82231f9281442;hp=9f56f8c692930e8e1abc49429ff435349dcfa5bd;hpb=a46af0460b0fdcc145c4dd282fa4fe071d4971fc;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 9f56f8c692..28905ee45f 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -30,6 +30,7 @@
 #include "ardour/session.h"
 
 #include "streamview.h"
+#include "global_signals.h"
 #include "region_view.h"
 #include "route_time_axis.h"
 #include "canvas-waveview.h"
@@ -73,6 +74,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* background_g
 	canvas_rect->raise(1); // raise above tempo lines
 
 	canvas_rect->property_outline_what() = (guint32) (0x2|0x8);  // outline RHS and bottom
+	canvas_rect->property_outline_color_rgba() = RGBA_TO_UINT (0, 0, 0, 255);
 
 	canvas_rect->signal_event().connect (sigc::bind (
 			sigc::mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event),
@@ -99,7 +101,7 @@ StreamView::~StreamView ()
 	if (owns_background_group) {
 		delete _background_group;
 	}
-	
+
 	if (owns_canvas_group) {
 		delete _canvas_group;
 	}
@@ -204,6 +206,8 @@ StreamView::remove_region_view (boost::weak_ptr<Region> weak_r)
 			break;
 		}
 	}
+
+	RegionViewRemoved (); /* EMIT SIGNAL */
 }
 
 void
@@ -304,7 +308,7 @@ StreamView::playlist_layered (boost::weak_ptr<Track> wtr)
 	} else {
 		/* layering has probably been modified. reflect this in the canvas. */
 		layer_regions();
-	} 
+	}
 }
 
 void
@@ -344,7 +348,7 @@ void
 StreamView::diskstream_changed ()
 {
 	boost::shared_ptr<Track> t;
-        
+
 	if ((t = _trackview.track()) != 0) {
 		Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&StreamView::display_track, this, t));
 	} else {
@@ -353,7 +357,7 @@ StreamView::diskstream_changed ()
 }
 
 void
-StreamView::apply_color (Gdk::Color& color, ColorTarget target)
+StreamView::apply_color (Gdk::Color color, ColorTarget target)
 {
 	list<RegionView *>::iterator i;
 
@@ -519,8 +523,21 @@ StreamView::get_selectables (framepos_t start, framepos_t end, double top, doubl
 
 	if (_layer_display == Stacked) {
 		double const c = child_height ();
-		min_layer = _layers - ((bottom - _trackview.y_position()) / c);
-		max_layer = _layers - ((top - _trackview.y_position()) / c);
+
+		int const mi = _layers - ((bottom - _trackview.y_position()) / c);
+		if (mi < 0) {
+			min_layer = 0;
+		} else {
+			min_layer = mi;
+		}
+
+		int const ma = _layers - ((top - _trackview.y_position()) / c);
+		if (ma > (int) _layers) {
+			max_layer = _layers - 1;
+		} else {
+			max_layer = ma;
+		}
+
 	}
 
 	for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
@@ -620,13 +637,13 @@ StreamView::check_record_layers (boost::shared_ptr<Region> region, framepos_t to
 
 		/* Stop this happening again */
 		_new_rec_layer_time = max_framepos;
-		
+
 		/* Make space in the view for the new layer */
 		++_layers;
-		
+
 		/* Set the temporary region to the correct layer so that it gets drawn correctly */
 		region->set_layer (_layers - 1);
-		
+
 		/* and reset the view */
 		update_contents_height ();
 	}
@@ -645,3 +662,19 @@ StreamView::setup_new_rec_layer_time (boost::shared_ptr<Region> region)
 		_new_rec_layer_time = max_framepos;
 	}
 }
+
+void
+StreamView::enter_internal_edit_mode ()
+{
+        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+                (*i)->hide_rect ();
+        }
+}
+
+void
+StreamView::leave_internal_edit_mode ()
+{
+        for (list<RegionView*>::iterator i = region_views.begin(); i != region_views.end(); ++i) {
+                (*i)->show_rect ();
+        }
+}