if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
/* edit */
- RouteGroupDialog d (_dragging->group, Gtk::Stock::APPLY);
+ RouteGroupDialog d (_dragging->group, false);
d.do_run ();
} else {
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 (_("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 (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)));
}
}
run_new_group_dialog (soloed);
-
}
void
RouteGroup* g = new RouteGroup (*_session, "");
g->apply_changes (default_properties ());
- RouteGroupDialog d (g, Gtk::Stock::NEW);
- int const r = d.do_run ();
+ RouteGroupDialog d (g, true);
- switch (r) {
- case Gtk::RESPONSE_OK:
- case Gtk::RESPONSE_ACCEPT:
+ 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);
}
- break;
- default:
- delete g;
}
}
g->apply_changes (default_properties ());
- RouteGroupDialog d (g, Gtk::Stock::NEW);
- int const r = d.do_run ();
+ RouteGroupDialog d (g, true);
- if (r != Gtk::RESPONSE_OK) {
+ if (d.do_run ()) {
delete g;
return 0;
}
void
GroupTabs::edit_group (RouteGroup* g)
{
- RouteGroupDialog d (g, Gtk::Stock::APPLY);
+ RouteGroupDialog d (g, false);
d.do_run ();
}
void
-GroupTabs::subgroup (RouteGroup* g)
+GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement)
{
- g->make_subgroup ();
+ g->make_subgroup (aux, placement);
}
struct CollectSorter {