X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fstreamview.cc;h=d6f2edeba9e9ef8ac645f120bbf98ebd80e956a9;hb=7f3c381a3acd8e605be76f1ba0ec7f1a7e11373f;hp=beed74c59f9e9681638af13901228aa05478ea60;hpb=fe7c3976c9382bb9f19797034dece570eefcbf01;p=ardour.git

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index beed74c59f..d6f2edeba9 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -56,13 +56,14 @@ StreamView::StreamView (RouteTimeAxisView& tv)
 	, use_rec_regions(tv.editor.show_waveforms_recording())
 	, region_color(_trackview.color())
 	, stream_base_color(0xFFFFFFFF)
+	, last_rec_data_frame(0)
 {
 	/* set_position() will position the group */
 
 	canvas_rect = new ArdourCanvas::SimpleRect (*canvas_group);
 	canvas_rect->property_x1() = 0.0;
 	canvas_rect->property_y1() = 0.0;
-	canvas_rect->property_x2() = 1000000.0;
+	canvas_rect->property_x2() = _trackview.editor.frame_to_pixel (max_frames);
 	canvas_rect->property_y2() = (double) tv.height;
 	canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
 	// (Fill/Outline colours set in derived classes)
@@ -111,16 +112,16 @@ StreamView::set_height (gdouble h)
 		return -1;
 	}
 
+	if (canvas_rect->property_y2() == h) {
+		return 0;
+	}
+
 	canvas_rect->property_y2() = h;
 
 	for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
 		(*i)->set_height (h);
 	}
 
-	/*for (CrossfadeViewList::iterator i = crossfade_views.begin(); i != crossfade_views.end(); ++i) {
-		(*i)->set_height (h);
-	}*/
-
 	for (vector<RecBoxInfo>::iterator i = rec_rects.begin(); i != rec_rects.end(); ++i) {
 		RecBoxInfo &recbox = (*i);
 		recbox.rectangle->property_y2() = h - 1.0;
@@ -160,7 +161,7 @@ StreamView::set_samples_per_unit (gdouble spp)
 void
 StreamView::add_region_view (boost::shared_ptr<Region> r)
 {
-	add_region_view_internal (r, true, true);
+	add_region_view_internal (r, true);
 }
 
 void
@@ -206,9 +207,7 @@ StreamView::playlist_modified ()
 {
 	ENSURE_GUI_THREAD (mem_fun (*this, &StreamView::playlist_modified));
 
-	for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
-		region_layered (*i);
-	}
+	redisplay_diskstream ();
 }
 
 void
@@ -231,20 +230,9 @@ StreamView::playlist_changed (boost::shared_ptr<Diskstream> ds)
 
 	/* catch changes */
 
-	playlist_connections.push_back (ds->playlist()->RegionAdded.connect (mem_fun (*this, &StreamView::add_region_view)));
-	playlist_connections.push_back (ds->playlist()->RegionRemoved.connect (mem_fun (*this, &StreamView::remove_region_view)));
-	playlist_connections.push_back (ds->playlist()->StateChanged.connect (mem_fun (*this, &StreamView::playlist_state_changed)));
 	playlist_connections.push_back (ds->playlist()->Modified.connect (mem_fun (*this, &StreamView::playlist_modified)));
 }
 
-void
-StreamView::playlist_state_changed (Change ignored)
-{
-	ENSURE_GUI_THREAD (bind (mem_fun (*this, &StreamView::playlist_state_changed), ignored));
-
-	redisplay_diskstream ();
-}
-
 void
 StreamView::diskstream_changed ()
 {