X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.h;h=f6f72b77bda6af0f5f8f70f82ae4a6eb1c603969;hb=74126c48c0726e5491a160d2b0f04e406fc80231;hp=0b3e01971941df1c4b1cb2cf686a60d1130511f6;hpb=bcd65def7da197a6f88eb1c4adb375f2b639f783;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 0b3e019719..f6f72b77bd 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -33,6 +33,7 @@ namespace ArdourCanvas {
 	class Rectangle;
 	class Item;
 	class Group;
+	class Text;
 }
 
 using ARDOUR::framepos_t;
@@ -75,11 +76,10 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	ArdourCanvas::Item* get_canvas_frame();
 	ArdourCanvas::Group* get_canvas_group();
 	ArdourCanvas::Item* get_name_highlight();
-	ArdourCanvas::Pixbuf* get_name_pixbuf();
 
-	virtual void set_frames_per_pixel (double);
+	virtual void set_samples_per_pixel (double);
 
-	double get_frames_per_pixel () const;
+	double get_samples_per_pixel () const;
 
 	virtual void drag_start() { _dragging = true; }
 	virtual void drag_end() { _dragging = false; }
@@ -161,11 +161,12 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	virtual void compute_colors (Gdk::Color const &);
 	virtual void set_colors();
 	virtual void set_frame_color();
+	virtual void set_frame_gradient ();
 	void set_trim_handle_colors();
 
 	virtual void reset_width_dependent_items (double);
 	void reset_name_width (double);
-	void update_name_pixbuf_visibility ();
+	void update_name_text_visibility ();
 
 	static gint idle_remove_this_item(TimeAxisViewItem*, void*);
 
@@ -194,7 +195,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	bool min_duration_active;
 
 	/** frames per canvas pixel */
-	double frames_per_pixel;
+	double samples_per_pixel;
 
 	/** should the item respond to events */
 	bool _sensitive;
@@ -228,7 +229,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	uint32_t lock_handle_color_g;
 	uint32_t lock_handle_color_b;
 	uint32_t last_item_width;
-	int name_pixbuf_width;
+	int name_text_width;
 	bool wide_enough_for_name;
 	bool high_enough_for_name;
         bool rect_visible;
@@ -236,7 +237,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	ArdourCanvas::Group*      group;
 	ArdourCanvas::Rectangle* vestigial_frame;
 	ArdourCanvas::Rectangle* frame;
-	ArdourCanvas::Pixbuf*     name_pixbuf;
+	ArdourCanvas::Text*      name_text;
 	ArdourCanvas::Rectangle* name_highlight;
 
 	/* with these two values, if frame_handle_start == 0 then frame_handle_end will also be 0 */