X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.h;h=e9497edbbec566cf497cff1d234d50ced8d68d92;hb=9f1293bfe5d22c42ee222a5fd5129d8faebd17f5;hp=cd2e4deb43b412bfff657c43c3c9134548fde49f;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.h b/gtk2_ardour/editor_routes.h
index cd2e4deb43..e9497edbbe 100644
--- a/gtk2_ardour/editor_routes.h
+++ b/gtk2_ardour/editor_routes.h
@@ -20,10 +20,18 @@
 #ifndef __ardour_gtk_editor_route_h__
 #define __ardour_gtk_editor_route_h__
 
+#include <gtkmm/liststore.h>
+#include <gtkmm/scrolledwindow.h>
+#include <gtkmm/treemodel.h>
+#include <gtkmm/treestore.h>
+
 #include "pbd/signals.h"
 #include "gtkmm2ext/widget_state.h"
+
 #include "editor_component.h"
 
+class VCATimeAxisView;
+
 class EditorRoutes : public EditorComponent, public PBD::ScopedConnectionList, public ARDOUR::SessionHandlePtr
 {
 public:
@@ -55,14 +63,14 @@ public:
 
 	void redisplay ();
 	void update_visibility ();
-	void routes_added (std::list<RouteTimeAxisView*> routes);
+	void time_axis_views_added (std::list<TimeAxisView*>);
 	void route_removed (TimeAxisView *);
 	void hide_track_in_display (TimeAxisView &);
 	std::list<TimeAxisView*> views () const;
 	void hide_all_tracks (bool);
 	void clear ();
 	void sync_presentation_info_from_treeview ();
-	void reset_remote_control_ids ();
+	void sync_treeview_from_presentation_info (PBD::PropertyChange const &);
 
 private:
 	void initial_display ();
@@ -75,14 +83,13 @@ private:
 	void on_tv_solo_isolate_toggled (std::string const &);
 	void on_tv_solo_safe_toggled (std::string const &);
 	void build_menu ();
-	void show_menu ();
-	void sync_treeview_from_presentation_info ();
+	void presentation_info_changed (PBD::PropertyChange const &);
 	void row_deleted (Gtk::TreeModel::Path const &);
 	void visible_changed (std::string const &);
 	void active_changed (std::string const &);
 	void reordered (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int *);
 	bool button_press (GdkEventButton *);
-	void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Route>);
+	void route_property_changed (const PBD::PropertyChange&, boost::weak_ptr<ARDOUR::Stripable>);
 	void handle_gui_changes (std::string const &, void *);
 	bool idle_update_mute_rec_solo_etc ();
 	void update_rec_display ();
@@ -107,10 +114,6 @@ private:
 
 	int plugin_setup (boost::shared_ptr<ARDOUR::Route>, boost::shared_ptr<ARDOUR::PluginInsert>, ARDOUR::Route::PluginSetupOptions);
 
-	void display_drag_data_received (
-		Glib::RefPtr<Gdk::DragContext> const &, gint, gint, Gtk::SelectionData const &, guint, guint
-		);
-
 	bool selection_filter (Glib::RefPtr<Gtk::TreeModel> const &, Gtk::TreeModel::Path const &, bool);
 	void name_edit (std::string const &, std::string const &);
 	void solo_changed_so_update_mute ();
@@ -124,14 +127,16 @@ private:
 			add (mute_state);
 			add (solo_state);
 			add (solo_visible);
+			add (solo_lock_iso_visible);
 			add (solo_isolate_state);
 			add (solo_safe_state);
 			add (is_track);
 			add (tv);
-			add (route);
+			add (stripable);
 			add (name_editable);
 			add (is_input_active);
 			add (is_midi);
+			add (no_vca);
 			add (active);
 		}
 
@@ -143,19 +148,21 @@ private:
 		Gtk::TreeModelColumn<uint32_t>       solo_state;
 		/** true if the solo buttons are visible for this route, otherwise false */
 		Gtk::TreeModelColumn<bool>           solo_visible;
+		Gtk::TreeModelColumn<bool>           solo_lock_iso_visible;
 		Gtk::TreeModelColumn<uint32_t>       solo_isolate_state;
 		Gtk::TreeModelColumn<uint32_t>       solo_safe_state;
 		Gtk::TreeModelColumn<bool>           is_track;
 		Gtk::TreeModelColumn<TimeAxisView*>  tv;
-		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
+		Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Stripable> >  stripable;
 		Gtk::TreeModelColumn<bool>           name_editable;
 		Gtk::TreeModelColumn<bool>           is_input_active;
 		Gtk::TreeModelColumn<bool>           is_midi;
+		Gtk::TreeModelColumn<bool>           no_vca; // activatable
 		Gtk::TreeModelColumn<bool>           active;
 	};
 
 	Gtk::ScrolledWindow _scroller;
-	Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Route> > _display;
+	Gtk::TreeView _display;
 	Glib::RefPtr<Gtk::ListStore> _model;
 	ModelColumns _columns;
 	int _name_column;
@@ -163,6 +170,7 @@ private:
 	int _active_column;
 
 	bool _ignore_reorder;
+	bool _ignore_selection_change;
 	bool _no_redisplay;
 	bool _adding_routes;
 	bool _route_deletion_in_progress;
@@ -172,7 +180,6 @@ private:
 
 	Gtk::Menu* _menu;
 	Gtk::Widget* old_focus;
-	uint32_t selection_countdown;
 	Gtk::CellEditable* name_editable;
 
 	bool key_press (GdkEventKey* ev);