X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=8e0941d591606c469a15b2bbffe6adedcf2be15f;hb=9204b2837ebbaa771d318cadf5cb2ea4d35e9fef;hp=da64b23498cc91294fa1be22be3cfccf6b605292;hpb=702cca1c93fe3a8c142380cba724823ff7a1f26b;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index da64b23498..8e0941d591 100644
--- 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,9 +82,9 @@ public:
 	void show_selection (TimeSelection&);
 	void set_button_names ();
 
-	void set_samples_per_unit (double);
+	void set_samples_per_pixel (double);
  	void set_height (uint32_t h);
-	void show_timestretch (framepos_t start, framepos_t end);
+	void show_timestretch (framepos_t start, framepos_t end, int layers, int layer);
 	void hide_timestretch ();
 	void selection_click (GdkEventButton*);
 	void set_selected_points (PointSelection&);
@@ -101,6 +104,7 @@ public:
 	void uncombine_regions ();
 	void uncombine_region (RegionView*);
 	void toggle_automation_track (const Evoral::Parameter& param);
+	void fade_range (TimeSelection&);
 
 	/* The editor calls these when mapping an operation across multiple tracks */
 	void use_new_playlist (bool prompt, std::vector<boost::shared_ptr<ARDOUR::Playlist> > const &);
@@ -142,8 +146,6 @@ public:
 
 	std::string state_id() const;
 
-	static void setup_slider_pix ();
-
 protected:
 	friend class StreamView;
 
@@ -206,12 +208,11 @@ protected:
 	void route_property_changed (const PBD::PropertyChange&);
 	void name_entry_changed ();
 
-	void update_rec_display ();
+	void blink_rec_display (bool onoff);
 
 	virtual void label_view ();
 
-	void reset_samples_per_unit ();
-	void horizontal_position_changed ();
+	void reset_samples_per_pixel ();
 
 	virtual void build_automation_action_menu (bool);
 	virtual void append_extra_display_menu_items () {}
@@ -232,22 +233,18 @@ 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 create_mute_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;
+	boost::shared_ptr<AutomationTimeAxisView> mute_track;
 
 	StreamView*           _view;
 	ArdourCanvas::Canvas& parent_canvas;
@@ -258,6 +255,7 @@ protected:
 	ArdourButton route_group_button;
 	ArdourButton playlist_button;
 	ArdourButton automation_button;
+	ArdourButton number_label;
 
 	Gtk::Menu           subplugin_menu;
 	Gtk::Menu*          automation_action_menu;
@@ -272,7 +270,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,8 +293,6 @@ protected:
 
 	GainMeterBase gm;
 
-	static Glib::RefPtr<Gdk::Pixbuf> slider;
-
 	XMLNode* underlay_xml_node;
 	bool set_underlay_state();
 
@@ -305,7 +301,14 @@ protected:
 	typedef std::list<RouteTimeAxisView*> UnderlayMirrorList;
 	UnderlayMirrorList _underlay_mirrors;
 
-	bool _ignore_track_mode_change; ///< true to ignore track mode change signals
+	bool _ignore_set_layer_display;
+
+private:
+
+	void remove_child (boost::shared_ptr<TimeAxisView>);
+	void update_playlist_tip ();
+	void parameter_changed (std::string const & p);
+	void update_track_number_visibility();
 };
 
 #endif /* __ardour_route_time_axis_h__ */