X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Froute_time_axis.h;h=c597f2893ca3a0fa774c3c87db666d398394bd4d;hb=aa60114843f4990ef93ba83974501495ddda358b;hp=1eb0cea00babbb6c6af1408de341edcbd3c7ad67;hpb=2592a320d42dd4a157ee16101c042d875d3142be;p=ardour.git

diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 1eb0cea00b..c597f2893c 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -99,7 +99,7 @@ public:
 	string              name() const;
 	StreamView*         view() const { return _view; }
 	ARDOUR::RouteGroup* edit_group() const;
-	ARDOUR::Playlist*   playlist() const;
+	boost::shared_ptr<ARDOUR::Playlist> playlist() const;
 
 protected:
 	friend class StreamView;
@@ -134,14 +134,6 @@ protected:
 	
 	gint edit_click  (GdkEventButton *);
 
-	void build_redirect_window ();
-	void redirect_click ();
-	void redirect_add ();
-	void redirect_remove ();
-	void redirect_edit ();
-	void redirect_relist ();
-	void redirect_row_selected (gint row, gint col, GdkEvent *ev);
-	void add_to_redirect_display (ARDOUR::Redirect *);
 	void redirects_changed (void *);
 	
 	void add_redirect_to_subplugin_menu (boost::shared_ptr<ARDOUR::Redirect>);
@@ -164,14 +156,10 @@ protected:
 	
 	void reset_redirect_automation_curves ();
 
-	void update_automation_view (ARDOUR::AutomationType);
-	
 	void take_name_changed (void *);
 	void route_name_changed (void *);
 	void name_entry_changed ();
 
-	void on_area_realize ();
-
 	virtual void label_view ();
 	
 	void add_edit_group_menu_item (ARDOUR::RouteGroup *, Gtk::RadioMenuItem::Group*);
@@ -188,14 +176,12 @@ protected:
 	void align_style_changed ();
 	void set_align_style (ARDOUR::AlignStyle);
 	
-	virtual void set_playlist (ARDOUR::Playlist *);
+	virtual void set_playlist (boost::shared_ptr<ARDOUR::Playlist>);
 	void         playlist_click ();
 	void         show_playlist_selector ();
 	void         playlist_changed ();
-	void         playlist_state_changed (ARDOUR::Change);
 	void         playlist_modified ();
 
-	void add_playlist_to_playlist_menu (ARDOUR::Playlist*);
 	void rename_current_playlist ();
 	
 	void         automation_click ();
@@ -207,7 +193,6 @@ protected:
 
 	void visual_click ();
 	void hide_click ();
-	gint when_displayed (GdkEventAny*);
 
 	void speed_changed ();
 	
@@ -238,16 +223,26 @@ protected:
 	Gtk::Menu           edit_group_menu;
 	Gtk::RadioMenuItem* align_existing_item;
 	Gtk::RadioMenuItem* align_capture_item;
+	Gtk::RadioMenuItem* normal_track_mode_item;
+	Gtk::RadioMenuItem* destructive_track_mode_item;
 	Gtk::Menu*          playlist_menu;
 	Gtk::Menu*          playlist_action_menu;
 	Gtk::MenuItem*      playlist_item;
 
+	void use_playlist (boost::weak_ptr<ARDOUR::Playlist>);
+
 	ArdourCanvas::SimpleRect* timestretch_rect;
-	
+
+	void set_track_mode (ARDOUR::TrackMode);
+	void _set_track_mode (ARDOUR::Track* track, ARDOUR::TrackMode mode, Gtk::RadioMenuItem* reset_item);
+	void track_mode_changed ();
+
 	list<RedirectAutomationInfo*>   redirect_automation;
 	vector<RedirectAutomationLine*> redirect_automation_curves;
 
 	sigc::connection modified_connection;
+
+	void post_construct ();
 };
 
 #endif /* __ardour_route_time_axis_h__ */