From d7aa102ce5e4fd7ea6b7e4683fc5a01ef5e3387b Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 7 Aug 2017 16:46:35 +0200 Subject: Name New VCAs from Selection --- gtk2_ardour/group_tabs.cc | 9 +++++++-- gtk2_ardour/group_tabs.h | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 9f82824737..63d8d59256 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -489,19 +489,21 @@ GroupTabs::unassign_group_to_master (uint32_t which, RouteGroup* group) const } void -GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) +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)) { /* error */ return; } + set_name = true; /* Get most recently created VCA... */ which = _session->vca_manager().vcas().back()->number(); @@ -525,6 +527,9 @@ GroupTabs::assign_some_to_master (uint32_t which, RouteList rl) for (RouteList::iterator r = rl.begin(); r != rl.end(); ++r) { (*r)->assign (master); } + if (set_name && !vcaname.empty()) { + master->set_name (vcaname); + } } RouteList @@ -568,7 +573,7 @@ GroupTabs::get_soloed () void GroupTabs::assign_selection_to_master (uint32_t which) { - assign_some_to_master (which, selected_routes ()); + assign_some_to_master (which, selected_routes (), _("Selection")); } void diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h index cdbcf52a4f..f6acf67301 100644 --- a/gtk2_ardour/group_tabs.h +++ b/gtk2_ardour/group_tabs.h @@ -132,7 +132,7 @@ private: void assign_selection_to_master (uint32_t which); void assign_recenabled_to_master (uint32_t which); void assign_soloed_to_master (uint32_t which); - void assign_some_to_master (uint32_t which, ARDOUR::RouteList); + void assign_some_to_master (uint32_t which, ARDOUR::RouteList, std::string vcaname = ""); ARDOUR::RouteList get_soloed (); ARDOUR::RouteList get_rec_enabled (); -- cgit v1.2.3