ardour/livetrax
13
0
Fork 0
Code

Merge branch 'ardour'

Browse Source
This commit is contained in:
Robin Gareus 2024-08-13 21:15:38 +02:00
commit 725f2d18c7
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/group_tabs.cc
View File

@ -705,7 +705,13 @@ GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master)
}
RouteGroup* g = new RouteGroup (*_session, "");
RouteGroupDialog* d = new RouteGroupDialog (g, true);
RouteGroupDialog* d = new RouteGroupDialog (g, true); // XXX
if (rl) {
for (auto const& r : *rl) {
r->DropReferences.connect (_new_route_group_connection, invalidator (*d), boost::bind (&Dialog::response, d, RESPONSE_CANCEL), gui_context());
}
}
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 ();
@ -714,6 +720,7 @@ GroupTabs::run_new_group_dialog (RouteList const * rl, bool with_master)
void
GroupTabs::new_group_dialog_finished (int r, RouteGroupDialog* d, RouteList const * rl, bool with_master) const
{
_new_route_group_connection.disconnect ();
if (r == RESPONSE_OK) {
if (!d->name_check()) {

2
gtk2_ardour/group_tabs.h
View File

@ -178,6 +178,8 @@ private:
bool _hovering;
mutable PBD::ScopedConnection _new_route_group_connection;
/** colors that have been used for new route group tabs */
static std::list<Gdk::Color> _used_colors;
};

4
gtk2_ardour/route_group_dialog.cc
View File

@ -43,9 +43,9 @@ using namespace PBD;
RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
#ifndef LIVETRAX
: ArdourDialog (_("Track/bus Group"), creating_new)
: ArdourDialog (_("Track/bus Group"))
#else
: ArdourDialog (_("Track Group"), creating_new)
: ArdourDialog (_("Track Group"))
#endif
, _group (g)
, _initial_name (g->name ())