X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.h;h=39ea78deb6cc224a11a77f40be494271d6498f3e;hb=0784660d912c171b0559991a2bea3478d35f52b9;hp=d61358ead5b17ff7b871bc667190b70941772e66;hpb=8648a8a13b04549362f14a0738947d997ef1abc7;p=ardour.git

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index d61358ead5..39ea78deb6 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -27,6 +27,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 +47,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 +62,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,14 +92,17 @@ private:
 	virtual double extent () const = 0;
 
 	virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
-	virtual PBD::PropertyList default_properties () 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 *);
@@ -108,7 +112,7 @@ private:
 	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 +124,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