X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=e31ad9643e519d7d880f7d13ca419c9b6ec7da4d;hb=285b76dc08ab5e14bd9951c51e2710a49e1f91ec;hp=ed4a24709f50ab3c9c7e8d52e3ca2fd395ce0e8e;hpb=7d32cf3813b7145b98c86b59867092e04aa2621a;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index ed4a24709f..e31ad9643e 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -19,7 +19,7 @@
 
 #include <gtkmm/menu.h>
 #include "editor_component.h"
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
 	class Session;
@@ -30,6 +30,10 @@ class Editor;
 
 /** Parent class for tabs which represent route groups as colored tabs;
  *  Currently used on the left-hand side of the editor and at the top of the mixer.
+ *
+ *  This class also contains a fair bit of code to handle changes to route
+ *  group colours; it seems a bit out of place, but I could not really think
+ *  of a better place to put it.
  */
 class GroupTabs : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
@@ -42,13 +46,13 @@ public:
 	/** @param g Route group, or 0.
          *  @return Menu to be popped up on right-click over the given route group.
 	 */
-	Gtk::Menu* get_menu (ARDOUR::RouteGroup* g);
+	Gtk::Menu* get_menu (ARDOUR::RouteGroup* g, bool tabArea = false);
 
 	void run_new_group_dialog (ARDOUR::RouteList const &);
 
-	static void set_group_color (ARDOUR::RouteGroup *, Gdk::Color);
+	static void set_group_color (ARDOUR::RouteGroup *, uint32_t);
 	static std::string group_gui_id (ARDOUR::RouteGroup *);
-	static Gdk::Color group_color (ARDOUR::RouteGroup *);
+	static uint32_t group_color (ARDOUR::RouteGroup *);
 
 protected:
 
@@ -57,11 +61,13 @@ protected:
 
 		double from;
 		double to;
-		Gdk::Color color; ///< color
+		uint32_t color; ///< color
 		ARDOUR::RouteGroup* group; ///< route group
 	};
 
 private:
+	static void emit_gui_changed_for_members (ARDOUR::RouteGroup *);
+
 	/** Compute all the tabs for this widget.
 	 *  @return Tabs.
 	 */
@@ -85,8 +91,6 @@ private:
 	virtual double extent () const = 0;
 
 	virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
-	virtual PBD::PropertyList default_properties () const = 0;
-	virtual std::string order_key () const = 0;
 	virtual ARDOUR::RouteList selected_routes () const = 0;
 	virtual void sync_order_keys () = 0;
 
@@ -98,11 +102,12 @@ private:
 	void set_activation (ARDOUR::RouteGroup *, bool);
 	void edit_group (ARDOUR::RouteGroup *);
 	void subgroup (ARDOUR::RouteGroup *, bool, ARDOUR::Placement);
+        void un_subgroup (ARDOUR::RouteGroup *);
 	void activate_all ();
 	void disable_all ();
 	void remove_group (ARDOUR::RouteGroup *);
 
-	void render (cairo_t *);
+	void render (cairo_t *, cairo_rectangle_t*);
 	void on_size_request (Gtk::Requisition *);
 	bool on_button_press_event (GdkEventButton *);
 	bool on_motion_notify_event (GdkEventMotion *);
@@ -110,9 +115,15 @@ private:
 
 	Tab * click_to_tab (double, std::list<Tab>::iterator *, std::list<Tab>::iterator *);
 
+	void route_group_property_changed (ARDOUR::RouteGroup *);
+	void route_added_to_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>);
+	void route_removed_from_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>);
+
 	Gtk::Menu* _menu;
 	std::list<Tab> _tabs; ///< current list of tabs
 	Tab* _dragging; ///< tab being dragged, or 0
+	/** routes that were in the tab that is being dragged when the drag started */
+	ARDOUR::RouteList _initial_dragging_routes;
 	bool _dragging_new_tab; ///< true if we're dragging a new tab
 	bool _drag_moved; ///< true if there has been movement during any current drag
 	double _drag_fixed; ///< the position of the fixed end of the tab being dragged