more profound changes to canvas scrolling, in particular find appropriate ScrollGroup...

[ardour.git] / gtk2_ardour / mixer_group_tabs.cc

diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index 2d33b54af358a312f2532ed75571bdcd4766991a..5878c3d3acac0fed345e653d1b62dbc572047751 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -19,8 +19,9 @@
 
 #include <boost/foreach.hpp>
 
+#include "gtkmm2ext/utils.h"
+
 #include "ardour/route_group.h"
-#include "ardour/session.h"
 #include "mixer_group_tabs.h"
 #include "mixer_strip.h"
 #include "mixer_ui.h"
@@ -104,7 +105,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        cairo_fill (cr);
 
        if (tab.group) {
-               pair<string, double> const f = fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
+               pair<string, double> const f = Gtkmm2ext::fit_to_pixels (cr, tab.group->name(), tab.to - tab.from - arc_radius * 2);
 
                cairo_text_extents_t ext;
                cairo_text_extents (cr, tab.group->name().c_str(), &ext);
@@ -169,12 +170,6 @@ MixerGroupTabs::default_properties () const
        return plist;
 }
 
-string
-MixerGroupTabs::order_key () const
-{
-       return X_("signal");
-}
-
 RouteList
 MixerGroupTabs::selected_routes () const
 {
@@ -191,5 +186,5 @@ MixerGroupTabs::selected_routes () const
 void
 MixerGroupTabs::sync_order_keys ()
 {
-       _mixer->sync_order_keys ("");
+       _mixer->sync_order_keys_from_treeview ();
 }