fix up big clock aspect ratio; fix color handling in audio clocks

[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 7fc9c2575aaf2879adfa7f05e6a0e87c45148315..7706ed7ee31469bb97f4429468857c03d8232dfa 100644 (file)
--- a/gtk2_ardour/automation_time_axis.h
+++ b/gtk2_ardour/automation_time_axis.h
@@ -70,10 +70,9 @@ class AutomationTimeAxisView : public TimeAxisView {
 
        virtual void set_height (uint32_t);
        void set_samples_per_unit (double);
-       bool set_visibility (bool yn);
        std::string name() const { return _name; }
 
-       void add_automation_event (ArdourCanvas::Item *item, GdkEvent *event, framepos_t, double);
+       void add_automation_event (GdkEvent *, framepos_t, double);
 
        void clear_lines ();
 
@@ -98,11 +97,9 @@ class AutomationTimeAxisView : public TimeAxisView {
        void reset_objects (PointSelection&);
 
        int  set_state (const XMLNode&, int version);
-       guint32 show_at (double y, int& nth, Gtk::VBox *parent);
-       void hide ();
 
-       static const std::string state_node_name;
-       XMLNode* get_state_node();
+       std::string state_id() const;
+       static bool parse_state_id (std::string const &, PBD::ID &, bool &, Evoral::Parameter &);
 
        boost::shared_ptr<ARDOUR::AutomationControl> control()    { return _control; }
        boost::shared_ptr<AutomationController>      controller() { return _controller; }
@@ -120,6 +117,12 @@ class AutomationTimeAxisView : public TimeAxisView {
                return _route;
        }
 
+       bool show_regions () const {
+               return _show_regions;
+       }
+
+       static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
+
   protected:
        /** parent route */
        boost::shared_ptr<ARDOUR::Route> _route;
@@ -156,6 +159,8 @@ class AutomationTimeAxisView : public TimeAxisView {
        Gtk::CheckMenuItem* mode_discrete_item;
        Gtk::CheckMenuItem* mode_line_item;
 
+       bool _show_regions;
+
        void add_line (boost::shared_ptr<AutomationLine>);
 
        void clear_clicked ();
@@ -168,6 +173,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        void cut_copy_clear_objects_one (AutomationLine&, PointSelection&, Editing::CutCopyOp);
        bool paste_one (AutomationLine&, ARDOUR::framepos_t, float times, Selection&, size_t nth);
        void reset_objects_one (AutomationLine&, PointSelection&);
+       void route_going_away ();
 
        void set_automation_state (ARDOUR::AutoState);
        bool ignore_state_request;
@@ -178,8 +184,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        void interpolation_changed (ARDOUR::AutomationList::InterpolationStyle);
 
        PBD::ScopedConnectionList _list_connections;
-
-       void update_extra_xml_shown (bool editor_shown);
+       PBD::ScopedConnectionList _route_connections;
 
        void entered ();
        void exited ();
@@ -187,7 +192,7 @@ class AutomationTimeAxisView : public TimeAxisView {
        //void set_colors ();
        void color_handler ();
 
-       static Pango::FontDescription* name_font;
+       static Pango::FontDescription name_font;
        static bool have_name_font;
 
 private: