X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=ff231e8a681c89a8105f0bb1eef91ab4be5fd150;hb=dfbc9da79aef9cc05808d29a20c6d12c5d553a80;hp=d8c488c70f9665d07eae66d3683f49788fd87f21;hpb=20aeb5af0abd50dc01db503d65897c7dfebf6467;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index d8c488c70f..ff231e8a68 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -50,9 +50,9 @@ public:
 
 	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:
 
@@ -61,7 +61,7 @@ protected:
 
 		double from;
 		double to;
-		Gdk::Color color; ///< color
+		uint32_t color; ///< color
 		ARDOUR::RouteGroup* group; ///< route group
 	};
 
@@ -92,7 +92,6 @@ private:
 
 	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;
 
@@ -104,11 +103,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 *);