Slightly grubby fix to restore plugin output meters (#3926).

[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 f466381d2bd2be065505bca33a0eaf1df37cd931..a948fe1b61c31dbd1e26c2cbaa8a3821ab31c81e 100644 (file)
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -29,11 +29,10 @@
 using namespace std;
 using namespace Gtk;
 using namespace ARDOUR;
+using namespace PBD;
 
 MixerGroupTabs::MixerGroupTabs (Mixer_UI* m)
-       : GroupTabs (0),
-         _mixer (m),
-         _menu (0)
+       : _mixer (m)
 {
 
 }
@@ -54,7 +53,7 @@ MixerGroupTabs::compute_tabs () const
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
-               if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) {
+               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
                        continue;
                }
 
@@ -63,14 +62,12 @@ MixerGroupTabs::compute_tabs () const
                if (g != tab.group) {
                        if (tab.group) {
                                tab.to = x;
-                               tab.last_ui_size = s->get_width ();
                                tabs.push_back (tab);
                        }
 
                        tab.from = x;
                        tab.group = g;
                        tab.colour = s->color ();
-                       tab.first_ui_size = s->get_width ();
                }
 
                x += s->get_width ();
@@ -89,7 +86,7 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
 {
        double const arc_radius = _height;
 
-       if (tab.group->is_active()) {
+       if (tab.group && tab.group->is_active()) {
                cairo_set_source_rgba (cr, tab.colour.get_red_p (), tab.colour.get_green_p (), tab.colour.get_blue_p (), 1);
        } else {
                cairo_set_source_rgba (cr, 1, 1, 1, 0.2);
@@ -101,16 +98,18 @@ MixerGroupTabs::draw_tab (cairo_t* cr, Tab const & tab) const
        cairo_line_to (cr, tab.from, _height);
        cairo_fill (cr);
 
-       pair<string, double> const f = 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);
-
-       cairo_set_source_rgb (cr, 1, 1, 1);
-       cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
-       cairo_save (cr);
-       cairo_show_text (cr, f.first.c_str());
-       cairo_restore (cr);
+       if (tab.group) {
+               pair<string, double> const f = 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);
+               
+               cairo_set_source_rgb (cr, 1, 1, 1);
+               cairo_move_to (cr, tab.from + (tab.to - tab.from - f.second) / 2, _height - ext.height / 2);
+               cairo_save (cr);
+               cairo_show_text (cr, f.first.c_str());
+               cairo_restore (cr);
+       }
 }
 
 double
@@ -119,89 +118,66 @@ MixerGroupTabs::primary_coordinate (double x, double) const
        return x;
 }
 
-void
-MixerGroupTabs::reflect_tabs (list<Tab> const & tabs)
+RouteList
+MixerGroupTabs::routes_for_tab (Tab const * t) const
 {
-       list<Tab>::const_iterator j = tabs.begin ();
-
+       RouteList routes;
        int32_t x = 0;
+
        TreeModel::Children rows = _mixer->track_model->children ();
        for (TreeModel::Children::iterator i = rows.begin(); i != rows.end(); ++i) {
 
                MixerStrip* s = (*i)[_mixer->track_columns.strip];
 
-               if (s->route()->is_master() || s->route()->is_control() || !s->marked_for_display()) {
-                       continue;
-               }
-
-               if (j == tabs.end()) {
-
-                       /* already run out of tabs, so no edit group */
-                       s->route()->set_route_group (0, this);
-
-               } else {
-
-                       if (x >= j->to) {
-                               /* this tab finishes before this track starts, so onto the next tab */
-                               ++j;
-                       }
+               if (s->route()->is_master() || s->route()->is_monitor() || !s->marked_for_display()) {
+                       continue;
+               }
 
-                       double const h = x + s->get_width() / 2;
+               if (x >= t->to) {
+                       /* tab finishes before this track starts */
+                       break;
+               }
 
-                       if (j->from < h && j->to > h) {
-                               s->route()->set_route_group (j->group, this);
-                       } else {
-                               s->route()->set_route_group (0, this);
-                       }
+               double const h = x + s->get_width() / 2;
 
+               if (t->from < h && t->to > h) {
+                       routes.push_back (s->route ());
                }
 
                x += s->get_width ();
        }
+
+       return routes;
 }
 
-Gtk::Menu*
-MixerGroupTabs::get_menu (RouteGroup* g)
+PropertyList
+MixerGroupTabs::default_properties () const
 {
-       if (g == 0) {
-               return 0;
-       }
-
-       using namespace Menu_Helpers;
-
-       delete _menu;
-       _menu = new Menu;
+       PropertyList plist;
 
-       MenuList& items = _menu->items ();
-       items.push_back (MenuElem (_("Edit..."), bind (mem_fun (*this, &MixerGroupTabs::edit_group), g)));
-       items.push_back (MenuElem (_("Subgroup"), bind (mem_fun (*this, &MixerGroupTabs::make_subgroup), g)));
-       items.push_back (SeparatorElem());
-       items.push_back (MenuElem (_("Remove"), bind (mem_fun (*this, &MixerGroupTabs::remove_group), g)));
+       plist.add (Properties::active, true);
+       plist.add (Properties::mute, true);
+       plist.add (Properties::solo, true);
+       plist.add (Properties::gain, true);
+       plist.add (Properties::recenable, true);
 
-       return _menu;
+       return plist;
 }
 
-void
-MixerGroupTabs::edit_group (RouteGroup* g)
-{
-       RouteGroupDialog d (g, Gtk::Stock::APPLY);
-       d.do_run ();
-}
-
-void
-MixerGroupTabs::remove_group (RouteGroup *g)
+string
+MixerGroupTabs::order_key () const
 {
-       _session->remove_route_group (*g);
+       return X_("signal");
 }
 
-void
-MixerGroupTabs::make_subgroup (RouteGroup* g)
+RouteList
+MixerGroupTabs::selected_routes () const
 {
-       g->make_subgroup ();
+       return _mixer->selection().routes;
 }
 
 void
-MixerGroupTabs::destroy_subgroup (RouteGroup* g)
+MixerGroupTabs::sync_order_keys ()
 {
-       g->destroy_subgroup ();
+       _mixer->sync_order_keys ("");
 }