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_time_axis.h | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/automation_time_axis.h')
| -rw-r--r-- | gtk2_ardour/automation_time_axis.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h index f1a9a8bd57..4de120649b 100644 --- a/gtk2_ardour/automation_time_axis.h +++ b/gtk2_ardour/automation_time_axis.h @@ -30,9 +30,9 @@ #include "ardour/automatable.h" #include "ardour/automation_list.h" -#include "canvas.h" +#include "canvas/rectangle.h" + #include "time_axis_view.h" -#include "simplerect.h" #include "automation_controller.h" namespace ARDOUR { @@ -69,7 +69,7 @@ class AutomationTimeAxisView : public TimeAxisView { ~AutomationTimeAxisView(); virtual void set_height (uint32_t); - void set_samples_per_unit (double); + void set_frames_per_pixel (double); std::string name() const { return _name; } void add_automation_event (GdkEvent *, framepos_t, double); @@ -132,7 +132,7 @@ class AutomationTimeAxisView : public TimeAxisView { boost::shared_ptr<AutomationController> _controller; Evoral::Parameter _parameter; - ArdourCanvas::SimpleRect* _base_rect; + ArdourCanvas::Rectangle* _base_rect; boost::shared_ptr<AutomationLine> _line; /** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */ |