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/time_axis_view.h | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/time_axis_view.h')
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index 17dfec986b..b9cae8cb23 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -44,7 +44,6 @@ #include "axis_view.h" #include "enums.h" #include "editing.h" -#include "canvas.h" namespace ARDOUR { class Session; @@ -58,6 +57,12 @@ namespace Gtk { class Menu; } +namespace ArdourCanvas { + class Canvas; + class Group; + class Item; +} + class PublicEditor; class RegionSelection; class TimeSelection; @@ -149,7 +154,7 @@ class TimeAxisView : public virtual AxisView virtual ARDOUR::RouteGroup* route_group() const { return 0; } virtual boost::shared_ptr<ARDOUR::Playlist> playlist() const { return boost::shared_ptr<ARDOUR::Playlist> (); } - virtual void set_samples_per_unit (double); + virtual void set_frames_per_pixel (double); virtual void show_selection (TimeSelection&); virtual void hide_selection (); virtual void reshow_selection (TimeSelection&); |