always compute range for a redirect automation line, even if it will not be drawn...

[ardour.git] / gtk2_ardour / automation_time_axis.h

diff --git a/gtk2_ardour/automation_time_axis.h b/gtk2_ardour/automation_time_axis.h
index 7b62e6eee2586397329c5d2f09ffe0719f495807..a92dc445f405ea51073ad74fb0b9d601b7260270 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -63,7 +63,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 
        ~AutomationTimeAxisView();
        
-       virtual void set_height (TimeAxisView::TrackHeight);
+       virtual void set_height (uint32_t);
        void set_samples_per_unit (double);
        std::string name() const { return _name; }
 
@@ -93,7 +93,7 @@ class AutomationTimeAxisView : public TimeAxisView {
 
        void show_all_control_points ();
        void hide_all_but_selected_control_points ();
-       void set_state (const XMLNode&);
+       int  set_state (const XMLNode&);
        XMLNode* get_state_node ();
 
   protected:
@@ -106,7 +106,6 @@ class AutomationTimeAxisView : public TimeAxisView {
        bool    first_call_to_set_height;
 
        Gtk::Button        hide_button;
-       Gtk::Button        height_button;
        Gtk::Button        clear_button;
        Gtk::Button        auto_button; 
        Gtk::Menu*         automation_menu;
@@ -119,7 +118,6 @@ class AutomationTimeAxisView : public TimeAxisView {
        Gtk::CheckMenuItem*     auto_write_item;
 
        void clear_clicked ();
-       void height_clicked ();
        void hide_clicked ();
        void auto_clicked ();
 
@@ -142,9 +140,9 @@ class AutomationTimeAxisView : public TimeAxisView {
        void exited ();
 
        void set_colors ();
-       void color_handler (ColorID, uint32_t);
+       void color_handler ();
 
-       static Pango::FontDescription name_font;
+       static Pango::FontDescription* name_font;
        static bool have_name_font;
 };