X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=94e7c8cfea23eb566d12dba134d40beb2f86013e;hb=04c484089c5f1ff064b111ce3e4f1e2ff7e7ec83;hp=32b6569488d89b794d595a55b360732377e45c6c;hpb=c1592864e1cd80f5cfcaab3c5b061f586e107de6;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 32b6569488..94e7c8cfea 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -18,15 +18,20 @@ */ #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" @@ -142,7 +147,7 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) 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) { @@ -205,12 +210,7 @@ GroupTabs::on_button_release_event (GdkEventButton*) 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) { @@ -300,57 +300,73 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato return under; } -Gtk::Menu* -GroupTabs::get_menu (RouteGroup* g, bool TabArea) +void +GroupTabs::add_new_from_items (Menu_Helpers::MenuList& items) { using namespace Menu_Helpers; - - delete _menu; - - _menu = new Menu; - _menu->set_name ("ArdourContextMenu"); - MenuList& items = _menu->items(); - - if (!TabArea) { - items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); - items.push_back (MenuElem (_("Create New Control Master ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_master)))); - items.push_back (MenuElem (_("Create New Group & Control Master ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group_with_master)))); - } - - Menu* new_from = new Menu; - { - MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), false, false))); - f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), false, false))); - f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), false, false))); - } - items.push_back (MenuElem (_("Create New Group From"), *new_from)); + Menu *new_from; new_from = new Menu; { MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true, false))); - f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), true, false))); - f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), true, false))); + 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 Master From"), *new_from)); + items.push_back (MenuElem (_("Create New Group From..."), *new_from)); new_from = new Menu; { MenuList& f = new_from->items (); - f.push_back (MenuElem (_("Selection..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_selection), true, true))); - f.push_back (MenuElem (_("Record Enabled..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_rec_enabled), true, true))); - f.push_back (MenuElem (_("Soloed..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::new_from_soloed), true, true))); + 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 & Master From"), *new_from)); + items.push_back (MenuElem (_("Create New Group with Master From..."), *new_from)); +} + +Gtk::Menu* +GroupTabs::get_menu (RouteGroup* g, bool in_tab_area) +{ + using namespace Menu_Helpers; + + delete _menu; + _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); + } + 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()); + + 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, 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 Control Master..."), *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 { @@ -360,26 +376,26 @@ GroupTabs::get_menu (RouteGroup* g, bool TabArea) 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()); - vca_menu = new Menu; - MenuList& f (vca_menu->items()); - f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); - f.push_back (MenuElem ("VCA 1", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 1))); - items.push_back (MenuElem (_("Assign Group to Control Master..."), *vca_menu)); } add_menu_items (_menu, g); - 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))); + 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 = new Menu; { MenuList& f (vca_menu->items()); f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); - f.push_back (MenuElem ("VCA 1", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 1))); - + 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 Control Master..."), *vca_menu)); @@ -387,8 +403,10 @@ GroupTabs::get_menu (RouteGroup* g, bool TabArea) vca_menu = new Menu; { MenuList& f (vca_menu->items()); - f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); - f.push_back (MenuElem ("VCA 1", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_recenabled_to_master), 1))); + 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 Control Master..."), *vca_menu)); @@ -396,49 +414,107 @@ GroupTabs::get_menu (RouteGroup* g, bool TabArea) vca_menu = new Menu; { MenuList& f (vca_menu->items()); - f.push_back (MenuElem ("New", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_selection_to_master), 0))); - f.push_back (MenuElem ("VCA 1", sigc::bind (sigc::mem_fun (*this, &GroupTabs::assign_soloed_to_master), 1))); + 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 Control Master..."))); + items.push_back (MenuElem (_("Assign Soloed to Control Master..."), *vca_menu)); - return _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_selection_to_master (uint32_t which) +GroupTabs::assign_group_to_master (uint32_t which, RouteGroup* group, bool rename_master) const { -} + if (!_session || !group) { + return; + } -void -GroupTabs::assign_recenabled_to_master (uint32_t which) -{ -} + boost::shared_ptr master; -void -GroupTabs::assign_soloed_to_master (uint32_t which) -{ + if (which == 0) { + if (_session->vca_manager().create_vca (1)) { + /* error */ + return; + } + + /* VCAs use 1-based counting. Get most recently created VCA... */ + which = _session->vca_manager().n_vcas(); + } + + 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 (bool just_master, bool with_master) +GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) { - RouteList rl = selected_routes (); + if (!_session) { + return; + } + + boost::shared_ptr master; + + if (which == 0) { + if (_session->vca_manager().create_vca (1)) { + /* error */ + return; + } + + /* VCAs use 1-based counting. Get most recently created VCA... */ + which = _session->vca_manager().n_vcas(); + } + + 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 (rl.empty()) { return; } - run_new_group_dialog (rl, with_master); + for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) { + (*r)->assign (master); + } } -void -GroupTabs::new_from_rec_enabled (bool just_master, bool with_master) +RouteList +GroupTabs::get_rec_enabled () { - boost::shared_ptr rl = _session->get_routes (); - 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()) { @@ -446,15 +522,12 @@ GroupTabs::new_from_rec_enabled (bool just_master, bool with_master) } } - if (rec_enabled.empty()) { - return; - } - - run_new_group_dialog (rec_enabled, with_master); + return rec_enabled; } -void -GroupTabs::new_from_soloed (bool just_master, bool with_master) + +RouteList +GroupTabs::get_soloed () { boost::shared_ptr rl = _session->get_routes (); @@ -466,70 +539,102 @@ GroupTabs::new_from_soloed (bool just_master, bool with_master) } } - if (soloed.empty()) { - return; - } - - run_new_group_dialog (soloed, with_master); + return soloed; } void -GroupTabs::run_new_group_dialog (RouteList const & rl, bool with_master) +GroupTabs::assign_selection_to_master (uint32_t which) { - RouteGroup* g = new RouteGroup (*_session, ""); - RouteGroupDialog d (g, true); + assign_some_to_master (which, selected_routes ()); +} - 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::assign_recenabled_to_master (uint32_t which) +{ + assign_some_to_master (which, get_rec_enabled()); } -RouteGroup * -GroupTabs::create_and_add_group () const +void +GroupTabs::assign_soloed_to_master (uint32_t which) { - RouteGroup* g = new RouteGroup (*_session, ""); - RouteGroupDialog d (g, true); + assign_some_to_master (which, get_soloed()); +} - if (d.do_run ()) { - delete g; - return 0; - } +void +GroupTabs::new_from_selection (bool with_master) +{ + RouteList rl (selected_routes()); + run_new_group_dialog (&rl, with_master); +} - _session->add_route_group (g); - return g; +void +GroupTabs::new_from_rec_enabled (bool with_master) +{ + RouteList rl (get_rec_enabled()); + run_new_group_dialog (&rl, with_master); } -RouteGroup * -GroupTabs::create_and_add_master () const +void +GroupTabs::new_from_soloed (bool with_master) { - return 0; + RouteList rl (get_soloed()); + run_new_group_dialog (&rl, with_master); } -RouteGroup * -GroupTabs::create_and_add_group_with_master () 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 (g, true); + 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) { + + if (!d->name_check()) { + return; + } + + _session->add_route_group (d->group()); - if (d.do_run ()) { - delete g; - return 0; + if (rl) { + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + d->group()->add (*i); + } + + 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 @@ -544,18 +649,6 @@ GroupTabs::un_subgroup (RouteGroup* g) g->destroy_subgroup (); } -struct CollectSorter { - bool operator () (boost::shared_ptr a, boost::shared_ptr b) { - return a->presentation_info () < b->presentation_info(); - } -}; - -struct OrderSorter { - bool operator() (boost::shared_ptr a, boost::shared_ptr 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. */ @@ -563,19 +656,22 @@ void GroupTabs::collect (RouteGroup* g) { boost::shared_ptr 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 routes = _session->get_routes (); - routes->sort (OrderSorter ()); + routes->sort (Stripable::PresentationOrderSorter()); RouteList::const_iterator j = routes->begin (); int diff = 0; int coll = -1; + + PresentationInfo::ChangeSuspender cs; + 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) { @@ -586,21 +682,19 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_presentation_group_order_explicit (coll); + (*j)->set_presentation_order (coll); ++coll; ++i; } else { - (*j)->set_presentation_group_order_explicit (k + diff); + (*j)->set_presentation_order (k + diff); } ++j; } - - _session->notify_presentation_info_change (); } void @@ -628,7 +722,14 @@ GroupTabs::set_activation (RouteGroup* g, bool a) void 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); + } } /** Set the color of the tab of a route group */ @@ -641,11 +742,12 @@ GroupTabs::set_group_color (RouteGroup* group, uint32_t color) 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; @@ -740,7 +842,7 @@ GroupTabs::route_added_to_route_group (RouteGroup*, boost::weak_ptr w) return; } - r->gui_changed (X_("color"), 0); + r->presentation_info().PropertyChanged (Properties::color); set_dirty (); } @@ -755,7 +857,7 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w return; } - r->gui_changed (X_("color"), 0); + r->presentation_info().PropertyChanged (Properties::color); set_dirty (); } @@ -763,7 +865,9 @@ GroupTabs::route_removed_from_route_group (RouteGroup*, boost::weak_ptr w void GroupTabs::emit_gui_changed_for_members (RouteGroup* rg) { + PresentationInfo::ChangeSuspender cs; + for (RouteList::iterator i = rg->route_list()->begin(); i != rg->route_list()->end(); ++i) { - (*i)->gui_changed (X_("color"), 0); + (*i)->presentation_info().PropertyChanged (Properties::color); } }