Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / route_time_axis.h

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index cab1ad940bba2baa6d8c7728d3b78ba09b9587c4..d6ea6f4124f43f7351b7ca5fcb99d104164b3e89 100644 (file)
--- 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 ();
@@ -142,8 +145,6 @@ public:
 
        std::string state_id() const;
 
-       static void setup_slider_pix ();
-
 protected:
        friend class StreamView;
 
@@ -210,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);
@@ -232,20 +233,14 @@ protected:
        virtual void hide_all_automation (bool apply_to_selection = false);
 
        void timestretch (framepos_t start, framepos_t end);
-
        void speed_changed ();
-
        void map_frozen ();
-
        void color_handler ();
-
        void region_view_added (RegionView*);
-
        void create_gain_automation_child (const Evoral::Parameter &, bool);
-
        void setup_processor_menu_and_curves ();
-
        void route_color_changed ();
+        bool can_edit_name() const;
 
        boost::shared_ptr<AutomationTimeAxisView> gain_track;
 
@@ -272,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);
 
@@ -295,9 +290,6 @@ protected:
 
        GainMeterBase gm;
 
-       static Glib::RefPtr<Gdk::Pixbuf> slider;
-       static Glib::RefPtr<Gdk::Pixbuf> slider_desensitised;
-
        XMLNode* underlay_xml_node;
        bool set_underlay_state();