X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.h;h=504082305222d711c7b6c4b15ad27959bf63e4b2;hb=6a4fb5838463b4b2803b999b0df0ec5b0d9e399f;hp=5408649f9568bbc15ff250009c4a7da8c129986e;hpb=f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.h b/gtk2_ardour/editor_route_groups.h
index 5408649f95..5040823052 100644
--- a/gtk2_ardour/editor_route_groups.h
+++ b/gtk2_ardour/editor_route_groups.h
@@ -17,9 +17,10 @@
 
 */
 
+#include "gtkmm2ext/stateful_button.h"
 #include "editor_component.h"
 
-class EditorRouteGroups : public EditorComponent
+class EditorRouteGroups : public EditorComponent, public ARDOUR::SessionHandlePtr
 {
 public:
 	EditorRouteGroups (Editor *);
@@ -27,72 +28,69 @@ public:
 	void set_session (ARDOUR::Session *);
 
 	Gtk::Widget& widget () {
-		return *_display_packer;
+		return _display_packer;
 	}
 
-	Gtk::Menu* menu (ARDOUR::RouteGroup *);
-
 	void clear ();
-	ARDOUR::RouteGroup* new_route_group () const;
 
 private:
 
         struct Columns : public Gtk::TreeModel::ColumnRecord {
 
                 Columns () {
+			add (gdkcolor);
+			add (text);
 			add (is_visible);
 			add (gain);
-			add (record);
+			add (gain_relative);
 			add (mute);
 			add (solo);
+			add (record);
+			add (monitoring);
 			add (select);
-			add (edits);
-			add (text);
+			add (active_shared);
+			add (active_state);
 			add (routegroup);
                 }
 
+	        Gtk::TreeModelColumn<Gdk::Color> gdkcolor;
+	        Gtk::TreeModelColumn<std::string> text;
 	        Gtk::TreeModelColumn<bool> is_visible;
 		Gtk::TreeModelColumn<bool> gain;
-		Gtk::TreeModelColumn<bool> record;
+		Gtk::TreeModelColumn<bool> gain_relative;
 		Gtk::TreeModelColumn<bool> mute;
 		Gtk::TreeModelColumn<bool> solo;
+		Gtk::TreeModelColumn<bool> record;
+		Gtk::TreeModelColumn<bool> monitoring;
 		Gtk::TreeModelColumn<bool> select;
-		Gtk::TreeModelColumn<bool> edits;
-	        Gtk::TreeModelColumn<std::string> text;
+		Gtk::TreeModelColumn<bool> active_shared;
+		Gtk::TreeModelColumn<bool> active_state;
 	        Gtk::TreeModelColumn<ARDOUR::RouteGroup*> routegroup;
 	};
 
 	Columns _columns;
 
-	void activate_all ();
-	void disable_all ();
-	void subgroup (ARDOUR::RouteGroup *);
-	void unsubgroup (ARDOUR::RouteGroup *);
-	void collect (ARDOUR::RouteGroup *);
-
+	void add (ARDOUR::RouteGroup *);
 	void row_change (const Gtk::TreeModel::Path&,const Gtk::TreeModel::iterator&);
-	void name_edit (const Glib::ustring&, const Glib::ustring&);
-	void new_from_selection ();
-	void new_from_rec_enabled ();
-	void new_from_soloed ();
-	void edit (ARDOUR::RouteGroup *);
+	void name_edit (const std::string&, const std::string&);
 	void button_clicked ();
-	gint button_press_event (GdkEventButton* ev);
-	void add (ARDOUR::RouteGroup* group);
-	void remove_route_group ();
+	bool button_press_event (GdkEventButton* ev);
 	void groups_changed ();
-	void flags_changed (void*, ARDOUR::RouteGroup*);
-	void set_activation (ARDOUR::RouteGroup *, bool);
+	void property_changed (ARDOUR::RouteGroup*, const PBD::PropertyChange &);
 	void remove_selected ();
-	void run_new_group_dialog (const ARDOUR::RouteList&);
+	void run_new_group_dialog ();
+	void row_deleted (Gtk::TreeModel::Path const &);
 
-	Gtk::Menu* _menu;
 	Glib::RefPtr<Gtk::ListStore> _model;
 	Glib::RefPtr<Gtk::TreeSelection> _selection;
 	Gtk::TreeView _display;
 	Gtk::ScrolledWindow _scroller;
-	Gtk::VBox* _display_packer;
+	Gtk::VBox _display_packer;
 	bool _in_row_change;
+	bool _in_rebuild;
+	PBD::ScopedConnectionList _property_changed_connections;
+	PBD::ScopedConnection all_route_groups_changed_connection;
+	Gtk::ColorSelectionDialog color_dialog;
 };