X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=f1f8c317fdf434067ffadeddc5241b17c3de2e7a;hb=4dc65e6613a375a836de4dd9901ac50a4ab43be6;hp=560d1f7c111bb123da79e0587dd0ef24225a180e;hpb=7b2975244165b4ffd1dcf4080c1be4c8dcbc6708;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 560d1f7c11..f1f8c317fd 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -18,27 +18,40 @@ */ #include + #include "ardour/session.h" #include "ardour/route_group.h" #include "ardour/route.h" +#include "ardour/vca_manager.h" +#include "ardour/vca.h" + +#include "gtkmm2ext/doi.h" #include "gui_thread.h" #include "route_group_dialog.h" #include "group_tabs.h" #include "keyboard.h" -#include "i18n.h" +#include "pbd/i18n.h" +#include "ardour_ui.h" +#include "rgb_macros.h" +#include "ui_config.h" +#include "utils.h" using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using Gtkmm2ext::Keyboard; +list GroupTabs::_used_colors; + GroupTabs::GroupTabs () : _menu (0) , _dragging (0) , _dragging_new_tab (0) { - + add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &GroupTabs::queue_draw)); } GroupTabs::~GroupTabs () @@ -52,8 +65,17 @@ GroupTabs::set_session (Session* s) SessionHandlePtr::set_session (s); if (_session) { - _session->RouteGroupChanged.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); - _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); + _session->RouteGroupPropertyChanged.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_group_property_changed, this, _1), gui_context() + ); + _session->RouteAddedToRouteGroup.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_added_to_route_group, this, _1, _2), gui_context() + ); + _session->RouteRemovedFromRouteGroup.connect ( + _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_removed_from_route_group, this, _1, _2), gui_context() + ); + + _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this, (cairo_rectangle_t*)0), gui_context()); } } @@ -64,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 @@ -97,9 +118,10 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) list::iterator j = _tabs.insert (next, n); t = &(*j); } - + } else { _dragging_new_tab = false; + _initial_dragging_routes = routes_for_tab (t); } _dragging = t; @@ -120,11 +142,17 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { RouteGroup* g = t ? t->group : 0; - Menu* m = get_menu (g); - if (m) { - m->popup (ev->button, ev->time); - } + if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier) && g) { + remove_group (g); + } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { + edit_group (g); + } else { + Menu* m = get_menu (g, true); + if (m) { + m->popup (ev->button, ev->time); + } + } } return true; @@ -155,12 +183,14 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev) set_dirty (); queue_draw (); + gdk_event_request_motions(ev); + return true; } bool -GroupTabs::on_button_release_event (GdkEventButton* ev) +GroupTabs::on_button_release_event (GdkEventButton*) { if (_dragging == 0) { return false; @@ -169,19 +199,8 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) if (!_drag_moved) { if (_dragging->group) { - - if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { - - /* edit */ - RouteGroupDialog d (_dragging->group, Gtk::Stock::APPLY); - d.do_run (); - - } else { - - /* toggle active state */ - _dragging->group->set_active (!_dragging->group->is_active (), this); - - } + /* toggle active state */ + _dragging->group->set_active (!_dragging->group->is_active (), this); } } else { @@ -190,25 +209,30 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) if (!routes.empty()) { if (_dragging_new_tab) { - RouteGroup* g = create_and_add_group (); - if (g) { - for (RouteList::iterator i = routes.begin(); i != routes.end(); ++i) { - g->add (*i); - } - } + run_new_group_dialog (&routes, false); } else { boost::shared_ptr r = _session->get_routes (); - for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - - if (find (routes.begin(), routes.end(), *i) == routes.end()) { - /* this route is not on the list of those that should be in _dragging's group */ - if ((*i)->route_group() == _dragging->group) { - _dragging->group->remove (*i); - } - } else { - _dragging->group->add (*i); + /* First add new ones, then remove old ones. + * We cannot allow the group to become temporarily empty, because + * Session::route_removed_from_route_group() will delete empty groups. + */ + for (RouteList::const_iterator i = routes.begin(); i != routes.end(); ++i) { + /* RouteGroup::add () ignores routes already present in the set */ + _dragging->group->add (*i); + } + for (RouteList::const_iterator i = r->begin(); i != r->end(); ++i) { + + bool const was_in_tab = find ( + _initial_dragging_routes.begin(), _initial_dragging_routes.end(), *i + ) != _initial_dragging_routes.end (); + + bool const now_in_tab = find (routes.begin(), routes.end(), *i) != routes.end(); + + if (was_in_tab && !now_in_tab) { + _dragging->group->remove (*i); } } + } } @@ -217,21 +241,25 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } _dragging = 0; + _initial_dragging_routes.clear (); return true; } void -GroupTabs::render (cairo_t* cr) +GroupTabs::render (Cairo::RefPtr const& ctx, cairo_rectangle_t*) { + cairo_t* cr = ctx->cobj(); if (_dragging == 0) { _tabs = compute_tabs (); } /* background */ - cairo_set_source_rgb (cr, 0, 0, 0); - cairo_rectangle (cr, 0, 0, _width, _height); + Gdk::Color c = get_style()->get_base (Gtk::STATE_NORMAL); + + cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); + cairo_rectangle (cr, 0, 0, get_width(), get_height()); cairo_fill (cr); /* tabs */ @@ -244,8 +272,8 @@ GroupTabs::render (cairo_t* cr) /** Convert a click position to a tab. * @param c Click position. - * @param prev Filled in with the previous tab to the click, or 0. - * @param next Filled in with the next tab after the click, or 0. + * @param prev Filled in with the previous tab to the click, or _tabs.end(). + * @param next Filled in with the next tab after the click, or _tabs.end(). * @return Tab under the click, or 0. */ @@ -259,6 +287,7 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato while (i != _tabs.end()) { if (i->from > c) { + *next = i; break; } @@ -275,169 +304,384 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato ++i; } - if (i != _tabs.end()) { - *next = i; + return under; +} - if (under) { - *next++; - } +void +GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items) +{ + using namespace Menu_Helpers; + Menu *new_from; + + new_from = manage (new Menu); + { + MenuList& f = new_from->items (); + f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), false))); + f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), false))); + f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), false))); } - - return under; + items.push_back (MenuElem (_("Create New Group From..."), *new_from)); + + new_from = manage (new Menu); + { + MenuList& f = new_from->items (); + f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true))); + f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), true))); + f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), true))); + } + items.push_back (MenuElem (_("Create New Group with Master From..."), *new_from)); } Gtk::Menu* -GroupTabs::get_menu (RouteGroup* g) +GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) { using namespace Menu_Helpers; delete _menu; - Menu* new_from = new Menu; - MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), sigc::mem_fun (*this, &GroupTabs::new_from_selection))); - f.push_back (MenuElem (_("Record Enabled..."), sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled))); - f.push_back (MenuElem (_("Soloed..."), sigc::mem_fun (*this, &GroupTabs::new_from_soloed))); - _menu = new Menu; _menu->set_name ("ArdourContextMenu"); + MenuList& items = _menu->items(); + Menu* vca_menu; + + const VCAList vcas = _session->vca_manager().vcas (); + + if (!in_tab_area) { + /* context menu is not for a group tab, show the "create new + from" items here + */ + add_new_from_items (items); + } - items.push_back (MenuElem (_("New..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); - items.push_back (MenuElem (_("New From"), *new_from)); - if (g) { - items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); - items.push_back (MenuElem (_("Subgroup"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g))); - items.push_back (MenuElem (_("Collect"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); + items.push_back (SeparatorElem()); + items.push_back (MenuElem (_("Edit Group..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); + items.push_back (MenuElem (_("Collect Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); + items.push_back (MenuElem (_("Remove Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); + + items.push_back (SeparatorElem()); + + 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))); + } + items.push_back (MenuElem (_("Assign Group to VCA..."), *vca_menu)); + } + + items.push_back (SeparatorElem()); + + if (g->has_subgroup()) { + items.push_back (MenuElem (_("Remove Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::un_subgroup), g))); + } else { + items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + } + items.push_back (MenuElem (_("Add New Aux Bus (pre-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PreFader))); + items.push_back (MenuElem (_("Add New Aux Bus (post-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PostFader))); + items.push_back (SeparatorElem()); + } add_menu_items (_menu, g); - + + if (in_tab_area) { + /* context menu is for a group tab, show the "create new + from" items here + */ + add_new_from_items (items); + } + + 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_selection_to_master), 0))); + 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_selection_to_master), (*v)->number()))); + } + } + + items.push_back (MenuElem (_("Assign Selection to VCA..."), *vca_menu)); + + vca_menu = manage (new Menu); + { + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), 0))); + 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_recenabled_to_master), (*v)->number()))); + } + + } + items.push_back (MenuElem (_("Assign Record Enabled to VCA..."), *vca_menu)); + + vca_menu = manage (new Menu); + { + MenuList& f (vca_menu->items()); + f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), 0))); + 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_soloed_to_master), (*v)->number()))); + } + + } + items.push_back (MenuElem (_("Assign Soloed to VCA..."), *vca_menu)); + items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Activate All"), sigc::mem_fun(*this, &GroupTabs::activate_all))); - items.push_back (MenuElem (_("Disable All"), sigc::mem_fun(*this, &GroupTabs::disable_all))); + items.push_back (MenuElem (_("Enable All Groups"), sigc::mem_fun(*this, &GroupTabs::activate_all))); + items.push_back (MenuElem (_("Disable All Groups"), sigc::mem_fun(*this, &GroupTabs::disable_all))); return _menu; - } void -GroupTabs::new_from_selection () +GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const { - RouteList rl = selected_routes (); - if (rl.empty()) { + if (!_session || !group) { + return; + } + + boost::shared_ptr master; + + if (which == 0) { + if (_session->vca_manager().create_vca (1).empty ()) { + /* error */ + return; + } + + /* Get most recently created VCA... */ + which = _session->vca_manager().vcas().back()->number(); + } + + 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; } - run_new_group_dialog (rl); + group->assign_master (master); + + if (rename_master){ + master->set_name (group->name()); + } } void -GroupTabs::new_from_rec_enabled () +GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const { - boost::shared_ptr rl = _session->get_routes (); + if (!_session || !group) { + return; + } - RouteList rec_enabled; + boost::shared_ptr master = _session->vca_manager().vca_by_number (which); - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if ((*i)->record_enabled()) { - rec_enabled.push_back (*i); + 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, std::string vcaname) +{ + if (!_session) { + return; + } + + boost::shared_ptr master; + bool set_name = false; + + if (which == 0) { + if (_session->vca_manager().create_vca (1).empty ()) { + /* error */ + return; } + set_name = true; + + /* Get most recently created VCA... */ + which = _session->vca_manager().vcas().back()->number(); } - if (rec_enabled.empty()) { + 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; } - run_new_group_dialog (rec_enabled); + + if (rl.empty()) { + return; + } + + for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) { + (*r)->assign (master); + } + if (set_name && !vcaname.empty()) { + master->set_name (vcaname); + } } -void -GroupTabs::new_from_soloed () +RouteList +GroupTabs::get_rec_enabled () { + RouteList rec_enabled; + + if (!_session) { + return rec_enabled; + } + boost::shared_ptr rl = _session->get_routes (); + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + boost::shared_ptr trk (boost::dynamic_pointer_cast (*i)); + if (trk && trk->rec_enable_control()->get_value()) { + rec_enabled.push_back (*i); + } + } + + return rec_enabled; +} + + +RouteList +GroupTabs::get_soloed () +{ + RouteList rl = _session->get_routelist (); RouteList soloed; - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + for (RouteList::iterator i = rl.begin(); i != rl.end(); ++i) { if (!(*i)->is_master() && (*i)->soloed()) { soloed.push_back (*i); } } - if (soloed.empty()) { - return; - } + return soloed; +} - run_new_group_dialog (soloed); +void +GroupTabs::assign_selection_to_master (uint32_t which) +{ + assign_some_to_master (which, selected_routes (), _("Selection")); +} +void +GroupTabs::assign_recenabled_to_master (uint32_t which) +{ + assign_some_to_master (which, get_rec_enabled()); } void -GroupTabs::run_new_group_dialog (RouteList const & rl) +GroupTabs::assign_soloed_to_master (uint32_t which) { - RouteGroup* g = new RouteGroup (*_session, ""); - g->apply_changes (default_properties ()); + assign_some_to_master (which, get_soloed()); +} + +void +GroupTabs::new_from_selection (bool with_master) +{ + RouteList rl (selected_routes()); + run_new_group_dialog (&rl, with_master); +} - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); +void +GroupTabs::new_from_rec_enabled (bool with_master) +{ + RouteList rl (get_rec_enabled()); + run_new_group_dialog (&rl, with_master); +} - switch (r) { - case Gtk::RESPONSE_OK: - case Gtk::RESPONSE_ACCEPT: - _session->add_route_group (g); - for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) { - g->add (*i); - } - break; - default: - delete g; - } +void +GroupTabs::new_from_soloed (bool with_master) +{ + RouteList rl (get_soloed()); + run_new_group_dialog (&rl, with_master); } -RouteGroup * -GroupTabs::create_and_add_group () const +void +GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master) { + if (rl && rl->empty()) { + return; + } + RouteGroup* g = new RouteGroup (*_session, ""); + RouteGroupDialog* d = new RouteGroupDialog (g, true); + + d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_group_dialog_finished), d, rl ? new RouteList (*rl): 0, with_master)); + d->present (); +} - g->apply_changes (default_properties ()); +void +GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const +{ + if (r == RESPONSE_OK) { - RouteGroupDialog d (g, Gtk::Stock::NEW); - int const r = d.do_run (); + if (!d->name_check()) { + return; + } + + _session->add_route_group (d->group()); + + if (rl) { + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + d->group()->add (*i); + } - if (r != Gtk::RESPONSE_OK) { - delete g; - return 0; + if (with_master) { + assign_group_to_master (0, d->group(), true); /* zero => new master */ + } + } + } else { + delete d->group (); } - - _session->add_route_group (g); - return g; + + delete rl; + delete_when_idle (d); } void GroupTabs::edit_group (RouteGroup* g) { - RouteGroupDialog d (g, Gtk::Stock::APPLY); - d.do_run (); + RouteGroupDialog* d = new RouteGroupDialog (g, false); + d->signal_response().connect (sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group_dialog_finished), d)); + d->present (); } void -GroupTabs::subgroup (RouteGroup* g) +GroupTabs::edit_group_dialog_finished (int r, RouteGroupDialog* d) const { - g->make_subgroup (); + delete_when_idle (d); } -struct CollectSorter { - CollectSorter (std::string const & key) : _key (key) {} - - bool operator () (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key (_key) < b->order_key (_key); - } +void +GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement) +{ + g->make_subgroup (aux, placement); +} - std::string _key; -}; +void +GroupTabs::un_subgroup (RouteGroup* g) +{ + g->destroy_subgroup (); +} /** Collect all members of a RouteGroup so that they are together in the Editor or Mixer. * @param g Group to collect. @@ -446,18 +690,22 @@ void GroupTabs::collect (RouteGroup* g) { boost::shared_ptr group_routes = g->route_list (); - group_routes->sort (CollectSorter (order_key ())); + group_routes->sort (Stripable::Sorter()); int const N = group_routes->size (); RouteList::iterator i = group_routes->begin (); - boost::shared_ptr routes = _session->get_routes (); - RouteList::const_iterator j = routes->begin (); + RouteList routes = _session->get_routelist (); + routes.sort (Stripable::Sorter()); + RouteList::const_iterator j = routes.begin (); int diff = 0; int coll = -1; - while (i != group_routes->end() && j != routes->end()) { - int const k = (*j)->order_key (order_key ()); + PresentationInfo::ChangeSuspender cs; + + while (i != group_routes->end() && j != routes.end()) { + + PresentationInfo::order_t const k = (*j)->presentation_info ().order(); if (*i == *j) { @@ -468,21 +716,19 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_order_key (order_key (), coll); + (*j)->set_presentation_order (coll); ++coll; ++i; } else { - - (*j)->set_order_key (order_key (), k + diff); - + + (*j)->set_presentation_order (k + diff); + } ++j; } - - sync_order_keys (); } void @@ -506,9 +752,128 @@ GroupTabs::set_activation (RouteGroup* g, bool a) { g->set_active (a, this); } - + void GroupTabs::remove_group (RouteGroup* g) { + boost::shared_ptr rl (g->route_list ()); _session->remove_route_group (*g); + + emit_gui_changed_for_members (rl); +} + +/** Set the color of the tab of a route group */ +void +GroupTabs::set_group_color (RouteGroup* group, uint32_t color) +{ + assert (group); + PresentationInfo::ChangeSuspender cs; + group->set_rgba (color); +} + +/** @return the ID string to use for the GUI state of a route group */ +string +GroupTabs::group_gui_id (RouteGroup* group) +{ + assert (group); + + char buf[64]; + snprintf (buf, sizeof (buf), "route_group %s", group->id().to_s().c_str ()); + + return buf; +} + +/** @return the color to use for a route group tab */ +uint32_t +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; + string const color = gui_state.get_string (gui_id, "color", &empty); + + if (empty) { + /* no color has yet been set, so use a random one */ + uint32_t c = gdk_color_to_rgba (unique_random_color (_used_colors)); + set_group_color (group, c); + return c; + } + + int r, g, b; + + /* for historical reasons, colors are stored as 16 bit values. */ + + sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b); + + r /= 256; + 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); +} + +void +GroupTabs::route_group_property_changed (RouteGroup* rg) +{ + /* 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 (rg->route_list ()); + + set_dirty (); +} + +void +GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->presentation_info().PropertyChanged (Properties::color); + + set_dirty (); +} + +void +GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w) +{ + /* Similarly-spirited hack as in route_group_property_changed */ + + boost::shared_ptr r = w.lock (); + if (!r) { + return; + } + + r->presentation_info().PropertyChanged (Properties::color); + + set_dirty (); +} + +void +GroupTabs::emit_gui_changed_for_members (boost::shared_ptr rl) +{ + PresentationInfo::ChangeSuspender cs; + + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + (*i)->presentation_info().PropertyChanged (Properties::color); + } }