X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=f6acf67301a17025ee594a074a134b4026e17e88;hb=b0c5005cecbe248b865c85e91b4b70410912bc6e;hp=39ea78deb6cc224a11a77f40be494271d6498f3e;hpb=2c44225df2569bffe452fe2a84b698488f203cf0;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 39ea78deb6..f6acf67301 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -17,6 +17,9 @@
 
 */
 
+#ifndef __gtk_ardour_group_tabs_h__
+#define __gtk_ardour_group_tabs_h__
+
 #include <gtkmm/menu.h>
 #include "editor_component.h"
 #include "gtkmm2ext/cairo_widget.h"
@@ -45,7 +48,7 @@ public:
 	void set_session (ARDOUR::Session *);
 
 	/** @param g Route group, or 0.
-         *  @return Menu to be popped up on right-click over the given route group.
+	 *  @return Menu to be popped up on right-click over the given route group.
 	 */
 	Gtk::Menu* get_menu (ARDOUR::RouteGroup* g, bool tabArea = false);
 
@@ -67,7 +70,7 @@ protected:
 	};
 
 private:
-	static void emit_gui_changed_for_members (ARDOUR::RouteGroup *);
+	static void emit_gui_changed_for_members (boost::shared_ptr<ARDOUR::RouteList>);
 
 	/** Compute all the tabs for this widget.
 	 *  @return Tabs.
@@ -78,7 +81,7 @@ private:
 	 *  @param cr Cairo context.
 	 *  @param t Tab.
 	 */
-	virtual void draw_tab (cairo_t* cr, Tab const & t) const = 0;
+	virtual void draw_tab (cairo_t* cr, Tab const & t) = 0;
 
 	/** @param x x coordinate
 	 *  @param y y coordinate
@@ -107,12 +110,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 un_subgroup (ARDOUR::RouteGroup *);
 	void activate_all ();
 	void disable_all ();
 	void remove_group (ARDOUR::RouteGroup *);
 
-	void render (cairo_t *, cairo_rectangle_t*);
+	void render (Cairo::RefPtr<Cairo::Context> const&, cairo_rectangle_t*);
 	void on_size_request (Gtk::Requisition *);
 	bool on_button_press_event (GdkEventButton *);
 	bool on_motion_notify_event (GdkEventMotion *);
@@ -125,10 +128,11 @@ private:
 	void route_removed_from_route_group (ARDOUR::RouteGroup *, boost::weak_ptr<ARDOUR::Route>);
 
 	void assign_group_to_master (uint32_t which, ARDOUR::RouteGroup*, bool rename_master) const;
+	void unassign_group_to_master (uint32_t which, ARDOUR::RouteGroup*) const;
 	void assign_selection_to_master (uint32_t which);
 	void assign_recenabled_to_master (uint32_t which);
 	void assign_soloed_to_master (uint32_t which);
-	void assign_some_to_master (uint32_t which, ARDOUR::RouteList);
+	void assign_some_to_master (uint32_t which, ARDOUR::RouteList, std::string vcaname = "");
 
 	ARDOUR::RouteList get_soloed ();
 	ARDOUR::RouteList get_rec_enabled ();
@@ -150,3 +154,5 @@ private:
 	/** colors that have been used for new route group tabs */
 	static std::list<Gdk::Color> _used_colors;
 };
+
+#endif // __gtk_ardour_group_tabs_h__