*/
#include <gtkmm/stock.h>
+
#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<Gdk::Color> GroupTabs::_used_colors;
, _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 ()
_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), gui_context());
+
+ _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this, (cairo_rectangle_t*)0), gui_context());
}
}
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
} else if (ev->button == 3) {
RouteGroup* g = t ? t->group : 0;
-
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) {
- /* edit */
- RouteGroupDialog d (g, false);
- d.do_run ();
+
+ 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);
+ Menu* m = get_menu (g, true);
if (m) {
m->popup (ev->button, ev->time);
}
set_dirty ();
queue_draw ();
+ gdk_event_request_motions(ev);
+
return true;
}
if (_dragging == 0) {
return false;
}
-
+
if (!_drag_moved) {
-
+
if (_dragging->group) {
/* toggle active state */
_dragging->group->set_active (!_dragging->group->is_active (), this);
}
-
+
} else {
/* finish drag */
RouteList routes = routes_for_tab (_dragging);
-
+
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<RouteList> r = _session->get_routes ();
- for (RouteList::iterator i = r->begin(); i != r->end(); ++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);
- } else if (!was_in_tab && now_in_tab) {
- _dragging->group->add (*i);
}
}
+
}
}
-
+
set_dirty ();
queue_draw ();
}
-
+
_dragging = 0;
_initial_dragging_routes.clear ();
}
void
-GroupTabs::render (cairo_t* cr)
+GroupTabs::render (Cairo::RefPtr<Cairo::Context> const& ctx, cairo_rectangle_t*)
{
+ cairo_t* cr = ctx->cobj();
if (_dragging == 0) {
_tabs = compute_tabs ();
}
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 */
for (list<Tab>::const_iterator i = _tabs.begin(); i != _tabs.end(); ++i) {
return under;
}
+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)));
+ }
+ 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 ();
- items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group))));
- items.push_back (MenuElem (_("Create New Group From"), *new_from));
+ if (!in_tab_area) {
+ /* context menu is not for a group tab, show the "create new
+ from" items here
+ */
+ add_new_from_items (items);
+ }
if (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());
- items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader)));
+
+ 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 (_("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::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const
+{
+ if (!_session || !group) {
+ return;
+ }
+
+ boost::shared_ptr<VCA> 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;
+ }
+
+ group->assign_master (master);
+
+ if (rename_master){
+ master->set_name (group->name());
+ }
}
void
-GroupTabs::new_from_selection ()
+GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const
{
- RouteList rl = selected_routes ();
- if (rl.empty()) {
+ if (!_session || !group) {
return;
}
- run_new_group_dialog (rl);
+ 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::new_from_rec_enabled ()
+GroupTabs::assign_some_to_master (uint32_t which, RouteList rl, std::string vcaname)
{
- boost::shared_ptr<RouteList> rl = _session->get_routes ();
+ if (!_session) {
+ return;
+ }
- RouteList rec_enabled;
+ boost::shared_ptr<VCA> master;
+ bool set_name = false;
- for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
- if ((*i)->record_enabled()) {
- rec_enabled.push_back (*i);
+ 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();
+ }
+
+ 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;
}
- if (rec_enabled.empty()) {
+
+ if (rl.empty()) {
return;
}
- run_new_group_dialog (rec_enabled);
+ 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<RouteList> rl = _session->get_routes ();
+ for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+ boost::shared_ptr<Track> trk (boost::dynamic_pointer_cast<Track> (*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::run_new_group_dialog (RouteList const & rl)
+GroupTabs::assign_recenabled_to_master (uint32_t which)
{
- RouteGroup* g = new RouteGroup (*_session, "");
- g->apply_changes (default_properties ());
+ assign_some_to_master (which, get_rec_enabled());
+}
+
+void
+GroupTabs::assign_soloed_to_master (uint32_t which)
+{
+ assign_some_to_master (which, get_soloed());
+}
- RouteGroupDialog d (g, true);
+void
+GroupTabs::new_from_selection (bool with_master)
+{
+ RouteList rl (selected_routes());
+ run_new_group_dialog (&rl, with_master);
+}
- if (d.do_run ()) {
- delete g;
- } else {
- _session->add_route_group (g);
- for (RouteList::const_iterator i = rl.begin(); i != rl.end(); ++i) {
- g->add (*i);
- }
- }
+void
+GroupTabs::new_from_rec_enabled (bool with_master)
+{
+ RouteList rl (get_rec_enabled());
+ run_new_group_dialog (&rl, with_master);
+}
+
+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 ();
+}
+
+void
+GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const
+{
+ if (r == RESPONSE_OK) {
- g->apply_changes (default_properties ());
+ if (!d->name_check()) {
+ return;
+ }
+
+ _session->add_route_group (d->group());
- RouteGroupDialog d (g, true);
+ if (rl) {
+ for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) {
+ d->group()->add (*i);
+ }
- if (d.do_run ()) {
- 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, false);
- 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::edit_group_dialog_finished (int r, RouteGroupDialog* d) const
+{
+ delete_when_idle (d);
}
void
g->make_subgroup (aux, placement);
}
-struct CollectSorter {
- CollectSorter (string const & key) : _key (key) {}
-
- bool operator () (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- return a->order_key (_key) < b->order_key (_key);
- }
-
- string _key;
-};
-
-struct OrderSorter {
- OrderSorter (string const & key) : _key (key) {}
-
- bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- /* use of ">" forces the correct sort order */
- return a->order_key (_key) < b->order_key (_key);
- }
-
- 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.
GroupTabs::collect (RouteGroup* g)
{
boost::shared_ptr<RouteList> 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<RouteList> routes = _session->get_routes ();
- routes->sort (OrderSorter (order_key ()));
- 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) {
--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
void
GroupTabs::remove_group (RouteGroup* g)
{
+ boost::shared_ptr<RouteList> 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, Gdk::Color color)
+GroupTabs::set_group_color (RouteGroup* group, uint32_t color)
{
assert (group);
-
- /* Hack to disallow black route groups; force a dark grey instead */
- if (color.get_red() == 0 && color.get_green() == 0 && color.get_blue() == 0) {
- color.set_grey_p (0.1);
- }
-
- GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state;
-
- char buf[64];
- snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue());
- 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 */
}
/** @return the color to use for a route group tab */
-Gdk::Color
+uint32_t
GroupTabs::group_color (RouteGroup* group)
{
assert (group);
-
- GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state;
- string const gui_id = group_gui_id (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 */
- Gdk::Color const color = unique_random_color (_used_colors);
- set_group_color (group, color);
- return color;
+ uint32_t c = gdk_color_to_rgba (unique_random_color (_used_colors));
+ set_group_color (group, c);
+ return c;
}
- Gdk::Color 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);
- c.set_red (r);
- c.set_green (g);
- c.set_blue (b);
-
- return c;
+ 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
for our routes.
*/
- emit_gui_changed_for_members (rg);
-
+ emit_gui_changed_for_members (rg->route_list ());
+
set_dirty ();
}
return;
}
- r->gui_changed (X_("color"), 0);
+ r->presentation_info().PropertyChanged (Properties::color);
set_dirty ();
}
return;
}
- r->gui_changed (X_("color"), 0);
+ r->presentation_info().PropertyChanged (Properties::color);
set_dirty ();
}
void
-GroupTabs::emit_gui_changed_for_members (RouteGroup* rg)
+GroupTabs::emit_gui_changed_for_members (boost::shared_ptr<RouteList> rl)
{
- for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) {
- (*i)->gui_changed (X_("color"), 0);
+ PresentationInfo::ChangeSuspender cs;
+
+ for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+ (*i)->presentation_info().PropertyChanged (Properties::color);
}
}
projects / ardour.git / blobdiff