X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=eadc19cc6cf0b4b47b8c0edda6a70b7c816f262e;hb=f7b005ebf10982c4e3c9f3462e2b4d5b5e99c0fb;hp=059f3ce60b9296a26207c310349d782be4ba471f;hpb=932b0e9ec1d0f7fb506ccd13bf08a4efe5f91297;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 059f3ce60b..eadc19cc6c 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -17,9 +17,12 @@
 
 */
 
+#ifndef __gtk_ardour_group_tabs_h__
+#define __gtk_ardour_group_tabs_h__
+
 #include <gtkmm/menu.h>
 #include "editor_component.h"
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
 	class Session;
@@ -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.
@@ -46,13 +50,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 &);
+	void run_new_group_dialog (ARDOUR::RouteList const *, bool with_master);
 
-	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,13 +65,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.
 	 */
@@ -91,24 +95,27 @@ 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;
 
-	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 *);
 	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 *);
@@ -120,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
@@ -137,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__