initial (incomplete) framework for DiskIOPoint manipulation

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 1a1b0d532889f851406c6be61fbe03d1d8a6312a..63d8d5925691cdf4ad4c4d599790b72b948c47f3 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -86,9 +86,8 @@ GroupTabs::set_session (Session* s)
 void
 GroupTabs::on_size_request (Gtk::Requisition *req)
 {
-       /* Use a dummy, small width and the actual height that we want */
-       req->width = 16;
-       req->height = 16;
+       req->width = std::max (16.f, rintf (16.f * UIConfiguration::instance().get_ui_scale()));
+       req->height = std::max (16.f, rintf (16.f * UIConfiguration::instance().get_ui_scale()));
 }
 
 bool
@@ -490,19 +489,21 @@ GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const
 }
 
 void
-GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
+GroupTabs::assign_some_to_master (uint32_t which, RouteList rl, std::string vcaname)
 {
        if (!_session) {
                return;
        }
 
        boost::shared_ptr<VCA> master;
+       bool set_name = false;
 
        if (which == 0) {
                if (_session->vca_manager().create_vca (1)) {
                        /* error */
                        return;
                }
+               set_name = true;
 
                /* Get most recently created VCA... */
                which = _session->vca_manager().vcas().back()->number();
@@ -524,7 +525,10 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
        }
 
        for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) {
-               (*r)->assign (master, false);
+               (*r)->assign (master);
+       }
+       if (set_name && !vcaname.empty()) {
+               master->set_name (vcaname);
        }
 }
 
@@ -569,7 +573,7 @@ GroupTabs::get_soloed ()
 void
 GroupTabs::assign_selection_to_master (uint32_t which)
 {
-       assign_some_to_master (which, selected_routes ());
+       assign_some_to_master (which, selected_routes (), _("Selection"));
 }
 
 void
@@ -680,12 +684,12 @@ void
 GroupTabs::collect (RouteGroup* g)
 {
        boost::shared_ptr<RouteList> group_routes = g->route_list ();
-       group_routes->sort (Stripable::PresentationOrderSorter());
+       group_routes->sort (Stripable::Sorter());
        int const N = group_routes->size ();
 
        RouteList::iterator i = group_routes->begin ();
        boost::shared_ptr<RouteList> routes = _session->get_routes ();
-       routes->sort (Stripable::PresentationOrderSorter());
+       routes->sort (Stripable::Sorter());
        RouteList::const_iterator j = routes->begin ();
 
        int diff = 0;
@@ -746,14 +750,10 @@ GroupTabs::set_activation (RouteGroup* g, bool a)
 void
 GroupTabs::remove_group (RouteGroup* g)
 {
-       RouteList rl (*(g->route_list().get()));
+       boost::shared_ptr<RouteList> rl (g->route_list ());
        _session->remove_route_group (*g);
 
-       PresentationInfo::ChangeSuspender cs;
-
-       for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) {
-               (*i)->presentation_info().PropertyChanged (Properties::color);
-       }
+       emit_gui_changed_for_members (rl);
 }
 
 /** Set the color of the tab of a route group */
@@ -761,42 +761,8 @@ void
 GroupTabs::set_group_color (RouteGroup* group, uint32_t color)
 {
        assert (group);
-       uint32_t r, g, b, a;
-
-       UINT_TO_RGBA (color, &r, &g, &b, &a);
-
-       /* Hack to disallow black route groups; force a dark grey instead */
-       const uint32_t dark_gray = 25;
-
-       if (r < dark_gray && g < dark_gray && b < dark_gray) {
-               r = dark_gray;
-               g = dark_gray;
-               b = dark_gray;
-       }
-
-       GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state;
-
-       char buf[64];
-
-       /* for historical reasons the colors must be stored as 16 bit color
-        * values. Ugh.
-        */
-
-       snprintf (buf, sizeof (buf), "%d:%d:%d", (r<<8), (g<<8), (b<<8));
-       gui_state.set_property (group_gui_id (group), "color", buf);
-
-       /* the group color change notification */
-
-       PBD::PropertyChange change;
-       change.add (Properties::color);
-       group->PropertyChanged (change);
-
-       /* This is a bit of a hack, but this might change
-          our route's effective color, so emit gui_changed
-          for our routes.
-       */
-
-       emit_gui_changed_for_members (group);
+       PresentationInfo::ChangeSuspender cs;
+       group->set_rgba (color);
 }
 
 /** @return the ID string to use for the GUI state of a route group */
@@ -817,6 +783,14 @@ GroupTabs::group_color (RouteGroup* group)
 {
        assert (group);
 
+       /* prefer libardour color, if set */
+       uint32_t rgba = group->rgba ();
+       if (rgba != 0) {
+               return rgba;
+       }
+
+       /* backwards compatibility, load old color */
+
        GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state;
        string const gui_id = group_gui_id (group);
        bool empty;
@@ -831,8 +805,7 @@ GroupTabs::group_color (RouteGroup* group)
 
        int r, g, b;
 
-       /* for historical reasons, colors are stored as 16 bit values.
-        */
+       /* for historical reasons, colors are stored as 16 bit values.  */
 
        sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b);
 
@@ -840,6 +813,9 @@ GroupTabs::group_color (RouteGroup* group)
        g /= 256;
        b /= 256;
 
+       group->migrate_rgba (RGBA_TO_UINT (r, g, b, 255));
+       gui_state.remove_node (gui_id);
+
        return RGBA_TO_UINT (r, g, b, 255);
 }
 
@@ -851,7 +827,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg)
           for our routes.
        */
 
-       emit_gui_changed_for_members (rg);
+       emit_gui_changed_for_members (rg->route_list ());
 
        set_dirty ();
 }
@@ -887,11 +863,11 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr<Route> w
 }
 
 void
-GroupTabs::emit_gui_changed_for_members (RouteGroup* rg)
+GroupTabs::emit_gui_changed_for_members (boost::shared_ptr<RouteList> rl)
 {
        PresentationInfo::ChangeSuspender cs;
 
-       for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) {
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                (*i)->presentation_info().PropertyChanged (Properties::color);
        }
 }