Update Tempo Tapping:

[ardour.git] / gtk2_ardour / group_tabs.cc

diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index ef012935750974111f88470a5e9cec8efadabfea..1efca69d12fb2c9495a9300c9090021153658a1c 100644 (file)
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -356,15 +356,18 @@ GroupTabs::get_menu (RouteGroup* g, bool in_tab_area)
 
                items.push_back (SeparatorElem());
 
-               vca_menu = manage (new Menu);
-               MenuList& f (vca_menu->items());
-               f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), 0, g, true)));
+               if (g->has_control_master()) {
+                       items.push_back (MenuElem (_("Drop Group from VCA..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::unassign_group_to_master), g->group_master_number(), g)));
+               } else {
+                       vca_menu = manage (new Menu);
+                       MenuList& f (vca_menu->items());
+                       f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), 0, g, true)));
 
-               for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
-                       f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
+                       for (VCAList::const_iterator v = vcas.begin(); v != vcas.end(); ++v) {
+                               f.push_back (MenuElem ((*v)->name().empty() ? string_compose ("VCA %1", (*v)->number()) : (*v)->name(), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
+                       }
+                       items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu));
                }
-               items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu));
-
 
                items.push_back (SeparatorElem());
 
@@ -466,6 +469,26 @@ GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool renam
        }
 }
 
+void
+GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const
+{
+       if (!_session || !group) {
+               return;
+       }
+
+       boost::shared_ptr<VCA> master = _session->vca_manager().vca_by_number (which);
+
+       if (!master) {
+               /* should never happen; if it does, basically something deeply
+                  odd happened, no reason to tell user because there's no
+                  sensible explanation.
+               */
+               return;
+       }
+
+       group->unassign_master (master);
+}
+
 void
 GroupTabs::assign_some_to_master (uint32_t which, RouteList rl)
 {
@@ -726,11 +749,7 @@ GroupTabs::remove_group (RouteGroup* g)
        RouteList rl (*(g->route_list().get()));
        _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 (g);
 }
 
 /** Set the color of the tab of a route group */
@@ -738,42 +757,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 */
@@ -794,6 +779,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;
@@ -808,8 +801,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);
 
@@ -817,6 +809,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);
 }