fix merge conflict with master

[ardour.git] / gtk2_ardour / time_axis_view_item.h

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index fc9ab4106e6b0604c2234fd20d26c7d0eed7a00b..60ff519216224e9732414871af4908a8b971d4eb 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -74,6 +74,8 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        void set_y (double);
        void set_color (Gdk::Color const &);
 
+        uint32_t get_fill_color () const;
+
        ArdourCanvas::Item* get_canvas_frame();
        ArdourCanvas::Group* get_canvas_group();
        ArdourCanvas::Item* get_name_highlight();
@@ -157,7 +159,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
        TimeAxisViewItem (const TimeAxisViewItem&);
 
-        void init (const std::string&, ArdourCanvas::Group*, double, Gdk::Color const &, framepos_t, framepos_t, Visibility, bool, bool);
+        void init (ArdourCanvas::Group*, double, Gdk::Color const &, framepos_t, framepos_t, Visibility, bool, bool);
 
         virtual bool canvas_group_event (GdkEvent*);
 
@@ -168,8 +170,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        void set_trim_handle_colors();
 
        virtual void reset_width_dependent_items (double);
-       void reset_name_width (double);
-       void update_name_text_visibility ();
 
        static gint idle_remove_this_item(TimeAxisViewItem*, void*);
 
@@ -256,8 +256,11 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        bool _dragging;
 
 private:
+        double _width;
 
        void parameter_changed (std::string);
+        void manage_name_highlight ();
+        void manage_name_text ();
 
 }; /* class TimeAxisViewItem */