Merge branch 'master' into cairocanvas

[ardour.git] / gtk2_ardour / group_tabs.h

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index ed4a24709f50ab3c9c7e8d52e3ca2fd395ce0e8e..d61358ead5b17ff7b871bc667190b70941772e66 100644 (file)
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -19,7 +19,7 @@
 
 #include <gtkmm/menu.h>
 #include "editor_component.h"
-#include "cairo_widget.h"
+#include "gtkmm2ext/cairo_widget.h"
 
 namespace ARDOUR {
        class Session;
@@ -30,6 +30,10 @@ class Editor;
 
 /** 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.
+ *
+ *  This class also contains a fair bit of code to handle changes to route
+ *  group colours; it seems a bit out of place, but I could not really think
+ *  of a better place to put it.
  */
 class GroupTabs : public CairoWidget, public ARDOUR::SessionHandlePtr
 {
@@ -62,6 +66,8 @@ protected:
        };
 
 private:
+       static void emit_gui_changed_for_members (ARDOUR::RouteGroup *);
+       
        /** Compute all the tabs for this widget.
         *  @return Tabs.
         */
@@ -86,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;
 
@@ -98,6 +103,7 @@ 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 *);
@@ -110,9 +116,15 @@ private:
 
        Tab * click_to_tab (double, std::list<Tab>::iterator *, std::list<Tab>::iterator *);
 
+       void route_group_property_changed (ARDOUR::RouteGroup *);
+       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>);
+
        Gtk::Menu* _menu;
        std::list<Tab> _tabs; ///< current list of tabs
        Tab* _dragging; ///< tab being dragged, or 0
+       /** routes that were in the tab that is being dragged when the drag started */
+       ARDOUR::RouteList _initial_dragging_routes;
        bool _dragging_new_tab; ///< true if we're dragging a new tab
        bool _drag_moved; ///< true if there has been movement during any current drag
        double _drag_fixed; ///< the position of the fixed end of the tab being dragged