revert to right-side mixer metric-labels

[ardour.git] / gtk2_ardour / group_tabs.h

diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 059f3ce60b9296a26207c310349d782be4ba471f..39ac42c9d5d7ab8582887ac32e34bb6ebbd39b42 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;
@@ -92,7 +92,7 @@ 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::RouteSortOrderKey order_key () const = 0;
        virtual ARDOUR::RouteList selected_routes () const = 0;
        virtual void sync_order_keys () = 0;
 
@@ -104,6 +104,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 *);