#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"
if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) {
/* edit */
RouteGroupDialog d (g, false);
- d.do_run ();
+ d.present ();
} else {
Menu* m = get_menu (g, true);
if (m) {
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) {
const VCAList vcas = _session->vca_manager().vcas ();
if (!in_tab_area) {
- 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 with Control Master ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group_with_master))));
-
/* context menu is not for a group tab, show the "create new
from" items here
*/
vca_menu = 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)));
+ 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 (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g)));
+ f.push_back (MenuElem (string_compose ("VCA %1", (*v)->number()), sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_group_to_master), (*v)->number(), g, true)));
}
items.push_back (MenuElem (_("Assign Group to Control Master..."), *vca_menu));
}
void
-GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group)
+GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const
{
if (!_session || !group) {
return;
}
group->assign_master (master);
+
+ if (rename_master){
+ master->set_name (group->name());
+ }
}
void
void
GroupTabs::new_from_selection (bool with_master)
{
- run_new_group_dialog (selected_routes(), with_master);
+ RouteList rl (selected_routes());
+ run_new_group_dialog (&rl, with_master);
}
void
GroupTabs::new_from_rec_enabled (bool with_master)
{
- run_new_group_dialog (get_rec_enabled(), with_master);
+ RouteList rl (get_rec_enabled());
+ run_new_group_dialog (&rl, with_master);
}
void
GroupTabs::new_from_soloed (bool with_master)
{
- run_new_group_dialog (get_soloed(), with_master);
+ RouteList rl (get_soloed());
+ run_new_group_dialog (&rl, with_master);
}
void
-GroupTabs::run_new_group_dialog (RouteList const & rl, bool with_master)
+GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master)
{
- if (rl.empty()) {
+ if (rl && rl->empty()) {
return;
}
RouteGroup* g = new RouteGroup (*_session, "");
- RouteGroupDialog d (g, true);
+ RouteGroupDialog* d = new RouteGroupDialog (g, true);
- 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);
- }
- }
+ 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 ();
}
-RouteGroup *
-GroupTabs::create_and_add_group () const
+void
+GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const
{
- RouteGroup* g = new RouteGroup (*_session, "");
- RouteGroupDialog d (g, true);
+ if (r == RESPONSE_OK) {
- if (d.do_run ()) {
- delete g;
- return 0;
- }
+ if (!d->name_check()) {
+ return;
+ }
- _session->add_route_group (g);
- return g;
-}
+ _session->add_route_group (d->group());
-RouteGroup *
-GroupTabs::create_and_add_master () const
-{
- return 0;
-}
-
-RouteGroup *
-GroupTabs::create_and_add_group_with_master () const
-{
- RouteGroup* g = new RouteGroup (*_session, "");
- 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->destroy_subgroup ();
}
-struct CollectSorter {
- bool operator () (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- return a->presentation_info () < b->presentation_info();
- }
-};
-
-struct OrderSorter {
- bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
- return a->presentation_info() < b->presentation_info();
- }
-};
-
/** 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 ());
+ group_routes->sort (Stripable::PresentationOrderSorter());
int const N = group_routes->size ();
RouteList::iterator i = group_routes->begin ();
boost::shared_ptr<RouteList> routes = _session->get_routes ();
- routes->sort (OrderSorter ());
+ routes->sort (Stripable::PresentationOrderSorter());
RouteList::const_iterator j = routes->begin ();
int diff = 0;
int coll = -1;
while (i != group_routes->end() && j != routes->end()) {
- PresentationInfo::order_t const k = (*j)->presentation_info ().group_order();
+ PresentationInfo::order_t const k = (*j)->presentation_info ().order();
if (*i == *j) {
--diff;
}
- (*j)->set_presentation_group_order_explicit (coll);
+ (*j)->set_presentation_order (coll, false);
++coll;
++i;
} else {
- (*j)->set_presentation_group_order_explicit (k + diff);
+ (*j)->set_presentation_order (k + diff, false);
}
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 == 0 && g == 0 && b == 0) {
- r = 25;
- g = 25;
- b = 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;
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 ();
}
projects / ardour.git / blobdiff