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/route_time_axis.h | |
| parent | 1d8bac08c0c00d44e22c581768a275e1b21a99a7 (diff) | |
initial commit of hand merging, plus getting "ancient" waf script to work correctly
Diffstat (limited to 'gtk2_ardour/route_time_axis.h')
| -rw-r--r-- | gtk2_ardour/route_time_axis.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h index 3a5bc34250..d6ea6f4124 100644 --- a/gtk2_ardour/route_time_axis.h +++ b/gtk2_ardour/route_time_axis.h @@ -43,7 +43,6 @@ #include "route_ui.h" #include "enums.h" #include "time_axis_view.h" -#include "canvas.h" #include "gain_meter.h" namespace ARDOUR { @@ -56,6 +55,10 @@ namespace ARDOUR { class Playlist; } +namespace ArdourCanvas { + class Rectangle; +} + class PublicEditor; class RegionView; class StreamView; @@ -79,7 +82,7 @@ public: void show_selection (TimeSelection&); void set_button_names (); - void set_samples_per_unit (double); + void set_frames_per_pixel (double); void set_height (uint32_t h); void show_timestretch (framepos_t start, framepos_t end, int layers, int layer); void hide_timestretch (); @@ -208,7 +211,7 @@ protected: virtual void label_view (); - void reset_samples_per_unit (); + void reset_frames_per_pixel (); void horizontal_position_changed (); virtual void build_automation_action_menu (bool); @@ -264,7 +267,7 @@ protected: void use_playlist (Gtk::RadioMenuItem *item, boost::weak_ptr<ARDOUR::Playlist> wpl); - ArdourCanvas::SimpleRect* timestretch_rect; + ArdourCanvas::Rectangle* timestretch_rect; void set_track_mode (ARDOUR::TrackMode, bool apply_to_selection = false); |