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_region_view.h | |
parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/automation_region_view.h')
-rw-r--r-- | gtk2_ardour/automation_region_view.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h index 3e2a9b6bbf..885bf2176c 100644 --- a/gtk2_ardour/automation_region_view.h +++ b/gtk2_ardour/automation_region_view.h @@ -26,7 +26,6 @@ #include "automation_time_axis.h" #include "automation_line.h" #include "enums.h" -#include "canvas.h" namespace ARDOUR { class AutomationList; @@ -43,7 +42,7 @@ public: boost::shared_ptr<ARDOUR::Region>, const Evoral::Parameter& parameter, boost::shared_ptr<ARDOUR::AutomationList>, - double initial_samples_per_unit, + double initial_frames_per_pixel, Gdk::Color const & basic_color); ~AutomationRegionView(); |