diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-04-04 00:32:52 -0400 |
| commit | aaea166135ace01709f7e0be64f40be80f4107ec (patch) | |
| tree | 0e794ef7a723e4aaf909b841a6816e405b4ceca1 /gtk2_ardour/automation_streamview.cc | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/automation_streamview.cc')
| -rw-r--r-- | gtk2_ardour/automation_streamview.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/gtk2_ardour/automation_streamview.cc b/gtk2_ardour/automation_streamview.cc index e477b7ce72..fa6a824819 100644 --- a/gtk2_ardour/automation_streamview.cc +++ b/gtk2_ardour/automation_streamview.cc @@ -31,7 +31,6 @@ #include "region_view.h" #include "automation_region_view.h" #include "automation_time_axis.h" -#include "canvas-simplerect.h" #include "region_selection.h" #include "selection.h" #include "public_editor.h" @@ -39,8 +38,6 @@ #include "rgb_macros.h" #include "gui_thread.h" #include "utils.h" -#include "simplerect.h" -#include "simpleline.h" using namespace std; using namespace ARDOUR; @@ -49,13 +46,13 @@ using namespace Editing; AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv) : StreamView (*dynamic_cast<RouteTimeAxisView*>(tv.get_parent()), - new ArdourCanvas::Group(*tv.canvas_background()), - new ArdourCanvas::Group(*tv.canvas_display())) + new ArdourCanvas::Group (tv.canvas_background()), + new ArdourCanvas::Group (tv.canvas_display())) , _automation_view(tv) , _pending_automation_state (Off) { //canvas_rect->property_fill_color_rgba() = stream_base_color; - canvas_rect->property_outline_color_rgba() = RGBA_BLACK; + canvas_rect->set_outline_color (RGBA_BLACK); } AutomationStreamView::~AutomationStreamView () @@ -108,7 +105,7 @@ AutomationStreamView::add_region_view_internal (boost::shared_ptr<Region> region region_view = new AutomationRegionView ( _canvas_group, _automation_view, region, _automation_view.parameter (), list, - _samples_per_unit, region_color + _frames_per_pixel, region_color ); region_view->init (region_color, false); |