X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Faudio_streamview.cc;h=bc5052c3907e8ac50e122fda00c16a740954383f;hb=c4be8c2a676adb0810fdc5d2a9dc1577f654a274;hp=fee25569f850d22dd9aed0e74bdf6e918af46a83;hpb=9a8ee11f6532c73320f76b10aabec68081c9ebf4;p=ardour.git

diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index fee25569f8..bc5052c390 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -46,7 +46,6 @@
 #include "ardour_ui.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
-#include "utils.h"
 
 #include "i18n.h"
 
@@ -98,19 +97,19 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
 	case Normal:
 		if (recording) {
 			region_view = new AudioRegionView (_canvas_group, _trackview, region,
-							   _frames_per_pixel, region_color, recording, TimeAxisViewItem::Visibility(
+							   _samples_per_pixel, region_color, recording, TimeAxisViewItem::Visibility(
 								   TimeAxisViewItem::ShowFrame |
 								   TimeAxisViewItem::HideFrameRight |
 								   TimeAxisViewItem::HideFrameLeft |
 								   TimeAxisViewItem::HideFrameTB));
 		} else {
 			region_view = new AudioRegionView (_canvas_group, _trackview, region,
-					_frames_per_pixel, region_color);
+					_samples_per_pixel, region_color);
 		}
 		break;
 	case Destructive:
 		region_view = new TapeAudioRegionView (_canvas_group, _trackview, region,
-				_frames_per_pixel, region_color);
+						       _samples_per_pixel, region_color);
 		break;
 	default:
 		fatal << string_compose (_("programming error: %1"), "illegal track mode in ::add_region_view_internal") << endmsg;
@@ -118,7 +117,7 @@ AudioStreamView::create_region_view (boost::shared_ptr<Region> r, bool wait_for_
 
 	}
 
-	region_view->init (region_color, wait_for_waves);
+	region_view->init (wait_for_waves);
 	region_view->set_amplitude_above_axis(_amplitude_above_axis);
 	region_view->set_height (child_height ());
 
@@ -263,20 +262,20 @@ AudioStreamView::setup_rec_box ()
 
 			at = _trackview.audio_track(); /* we know what it is already */
 			framepos_t const frame_pos = at->current_capture_start ();
-			gdouble xstart = _trackview.editor().frame_to_pixel (frame_pos);
-			gdouble xend;
+			gdouble xstart = _trackview.editor().sample_to_pixel (frame_pos);
+			gdouble xend = xstart; /* keeps gcc optimized happy, really set in switch() below */
 			uint32_t fill_color;
 
 			switch (_trackview.audio_track()->mode()) {
 			case Normal:
 			case NonLayered:
 				xend = xstart;
-				fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+				fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
 				break;
 
 			case Destructive:
 				xend = xstart + 2;
-				fill_color = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+				fill_color = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
 				/* make the recording rect translucent to allow
 				   the user to see the peak data coming in, etc.
 				*/
@@ -289,8 +288,8 @@ AudioStreamView::setup_rec_box ()
 			rec_rect->set_y0 (1);
 			rec_rect->set_x1 (xend);
 			rec_rect->set_y1 (child_height ());
-			rec_rect->set_outline_what (0);
-			rec_rect->set_outline_color (ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get());
+			rec_rect->set_outline_what (ArdourCanvas::Rectangle::What (0));
+			rec_rect->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
 			rec_rect->set_fill_color (fill_color);
 			rec_rect->lower_to_bottom();
 
@@ -435,7 +434,7 @@ AudioStreamView::update_rec_regions (framepos_t start, framecnt_t cnt)
 
 					/* also update rect */
 					ArdourCanvas::Rectangle * rect = rec_rects[n].rectangle;
-					gdouble xend = _trackview.editor().frame_to_pixel (region->position() + region->length());
+					gdouble xend = _trackview.editor().sample_to_pixel (region->position() + region->length());
 					rect->set_x1 (xend);
 				}
 
@@ -529,15 +528,15 @@ AudioStreamView::color_handler ()
 {
 	//case cAudioTrackBase:
 	if (_trackview.is_track()) {
-		canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_AudioTrackBase.get());
+		canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioTrackBase());
 	}
 
 	//case cAudioBusBase:
 	if (!_trackview.is_track()) {
 		if (Profile->get_sae() && _trackview.route()->is_master()) {
-			canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_AudioMasterBusBase.get());
+			canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioMasterBusBase());
 		} else {
-			canvas_rect->set_fill_color (ARDOUR_UI::config()->canvasvar_AudioBusBase.get());
+			canvas_rect->set_fill_color (ARDOUR_UI::config()->get_canvasvar_AudioBusBase());
 		}
 	}
 }