X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=eadc19cc6cf0b4b47b8c0edda6a70b7c816f262e;hb=910cbc600cb11f0554b277cf761811ccf58443a8;hp=325e3f7ee76494de35964ddbee8e974cc2a1900e;hpb=e0ff70cf86c01c42f98faf8b0eaf1a8ccf867946;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 325e3f7ee7..eadc19cc6c 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"
@@ -27,6 +30,7 @@ namespace ARDOUR {
 }
 
 class Editor;
+class RouteGroupDialog;
 
 /** 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.
@@ -48,7 +52,7 @@ public:
 	 */
 	Gtk::Menu* get_menu (ARDOUR::RouteGroup* g, bool tabArea = false);
 
-	void run_new_group_dialog (ARDOUR::RouteList const &);
+	void run_new_group_dialog (ARDOUR::RouteList const *, bool with_master);
 
 	static void set_group_color (ARDOUR::RouteGroup *, uint32_t);
 	static std::string group_gui_id (ARDOUR::RouteGroup *);
@@ -93,10 +97,15 @@ private:
 	virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
 	virtual ARDOUR::RouteList selected_routes () const = 0;
 
-	void new_from_selection ();
-	void new_from_rec_enabled ();
-	void new_from_soloed ();
-	ARDOUR::RouteGroup* create_and_add_group () const;
+	void add_new_from_items (Gtk::Menu_Helpers::MenuList&);
+
+	void new_from_selection (bool with_master);
+	void new_from_rec_enabled (bool with_master);
+	void new_from_soloed (bool with_master);
+
+	void new_group_dialog_finished (int, RouteGroupDialog*, ARDOUR::RouteList const *, bool with_master) const;
+	void edit_group_dialog_finished (int, RouteGroupDialog*) const;
+
 	void collect (ARDOUR::RouteGroup *);
 	void set_activation (ARDOUR::RouteGroup *, bool);
 	void edit_group (ARDOUR::RouteGroup *);
@@ -118,6 +127,15 @@ private:
 	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>);
 
+	void assign_group_to_master (uint32_t which, ARDOUR::RouteGroup*, bool rename_master) 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);
+
+	ARDOUR::RouteList get_soloed ();
+	ARDOUR::RouteList get_rec_enabled ();
+
 	Gtk::Menu* _menu;
 	std::list<Tab> _tabs; ///< current list of tabs
 	Tab* _dragging; ///< tab being dragged, or 0
@@ -135,3 +153,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__