Cleanups and a few comments.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index 692d1a1e57..9831bf742f 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -48,12 +48,12 @@ using namespace Editing;
 StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
 	: _trackview (tv)
 	, owns_canvas_group(group == 0)
-	, _background_group(new ArdourCanvas::Group(*_trackview.canvas_background))
-	, canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display))
-	, _samples_per_unit(_trackview.editor.get_current_zoom())
+	, _background_group (new ArdourCanvas::Group (*_trackview.canvas_background()))
+	, canvas_group(group ? group : new ArdourCanvas::Group(*_trackview.canvas_display()))
+	, _samples_per_unit (_trackview.editor().get_current_zoom ())
 	, rec_updating(false)
 	, rec_active(false)
-	, use_rec_regions(tv.editor.show_waveforms_recording())
+	, use_rec_regions (tv.editor().show_waveforms_recording ())
 	, region_color(_trackview.color())
 	, stream_base_color(0xFFFFFFFF)
 	, layers(1)
@@ -66,7 +66,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
 	canvas_rect = new ArdourCanvas::SimpleRect (*_background_group);
 	canvas_rect->property_x1() = 0.0;
 	canvas_rect->property_y1() = 0.0;
-	canvas_rect->property_x2() = _trackview.editor.get_physical_screen_width();
+	canvas_rect->property_x2() = _trackview.editor().get_physical_screen_width ();
 	canvas_rect->property_y2() = (double) tv.current_height();
 	canvas_rect->raise(1); // raise above tempo lines
 
@@ -76,7 +76,7 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
 	//canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8);  // outline ends and bottom 
 	// (Fill/Outline colours set in derived classes)
 
-	canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
+	canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor(), &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));
 
 	if (_trackview.is_track()) {
 		_trackview.track()->DiskstreamChanged.connect (mem_fun (*this, &StreamView::diskstream_changed));
@@ -151,8 +151,8 @@ StreamView::set_samples_per_unit (gdouble spp)
 	for (vector<RecBoxInfo>::iterator xi = rec_rects.begin(); xi != rec_rects.end(); ++xi) {
 		RecBoxInfo &recbox = (*xi);
 		
-		gdouble xstart = _trackview.editor.frame_to_pixel ( recbox.start );
-		gdouble xend = _trackview.editor.frame_to_pixel ( recbox.start + recbox.length );
+		gdouble xstart = _trackview.editor().frame_to_pixel (recbox.start);
+		gdouble xend = _trackview.editor().frame_to_pixel (recbox.start + recbox.length);
 
 		recbox.rectangle->property_x1() = xstart;
 		recbox.rectangle->property_x2() = xend;
@@ -351,14 +351,14 @@ StreamView::update_rec_box ()
 		switch (_trackview.track()->mode()) {
 		case Normal:
 			rect.length = at - rect.start;
-			xstart = _trackview.editor.frame_to_pixel (rect.start);
-			xend = _trackview.editor.frame_to_pixel (at);
+			xstart = _trackview.editor().frame_to_pixel (rect.start);
+			xend = _trackview.editor().frame_to_pixel (at);
 			break;
 			
 		case Destructive:
 			rect.length = 2;
-			xstart = _trackview.editor.frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
-			xend = _trackview.editor.frame_to_pixel (at);
+			xstart = _trackview.editor().frame_to_pixel (_trackview.get_diskstream()->current_capture_start());
+			xend = _trackview.editor().frame_to_pixel (at);
 			break;
 		}