summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorTodd Naugle <tnaugle@blackdog>2015-09-21 14:52:25 -0500
committerTodd Naugle <tnaugle@blackdog>2015-09-21 14:52:25 -0500
commit203a72f8839b0f459385df2b7bf903cc6fe53536 (patch)
tree7256c5671887d0826a0a9dc2566bd80079c1323c /gtk2_ardour
parent233c144c2cb0b345f49d9b0f37c3298de86d265a (diff)
Create new Groups with a consistent set of default properties.
This is part of a larger fix for #6450. Previously new route groups were created with different default properties depending on which code created the new group. The group tab method had all properties set and that is now going to be the default for all other methods (mixer strip button, etc).
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/add_route_dialog.cc5
-rw-r--r--gtk2_ardour/group_tabs.cc25
-rw-r--r--gtk2_ardour/group_tabs.h1
-rw-r--r--gtk2_ardour/route_group_menu.cc2
4 files changed, 0 insertions, 33 deletions
diff --git a/gtk2_ardour/add_route_dialog.cc b/gtk2_ardour/add_route_dialog.cc
index 53fbe613c6..2e58c646ea 100644
--- a/gtk2_ardour/add_route_dialog.cc
+++ b/gtk2_ardour/add_route_dialog.cc
@@ -531,11 +531,6 @@ AddRouteDialog::group_changed ()
{
if (_session && route_group_combo.get_active_text () == _("New Group...")) {
RouteGroup* g = new RouteGroup (*_session, "");
-
- PropertyList plist;
- plist.add (Properties::active, true);
- g->apply_changes (plist);
-
RouteGroupDialog d (g, true);
if (d.do_run ()) {
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 19dc590102..b31f64cf01 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -395,32 +395,10 @@ GroupTabs::new_from_soloed ()
run_new_group_dialog (soloed);
}
-PBD::PropertyList
-GroupTabs::default_properties () const
-{
- PBD::PropertyList plist;
-
- plist.add (Properties::route_active, true);
- plist.add (Properties::active, true);
- plist.add (Properties::gain, true);
- plist.add (Properties::relative, true);
- plist.add (Properties::color, true);
- plist.add (Properties::monitoring, true);
- plist.add (Properties::select, true);
- plist.add (Properties::mute, true);
- plist.add (Properties::solo, true);
- plist.add (Properties::gain, true);
- plist.add (Properties::recenable, true);
-
- return plist;
-}
-
void
GroupTabs::run_new_group_dialog (RouteList const & rl)
{
RouteGroup* g = new RouteGroup (*_session, "");
- g->apply_changes (default_properties ());
-
RouteGroupDialog d (g, true);
if (d.do_run ()) {
@@ -437,9 +415,6 @@ RouteGroup *
GroupTabs::create_and_add_group () const
{
RouteGroup* g = new RouteGroup (*_session, "");
-
- g->apply_changes (default_properties ());
-
RouteGroupDialog d (g, true);
if (d.do_run ()) {
diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index 95b3ec5751..41c6cfefee 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -91,7 +91,6 @@ private:
virtual double extent () const = 0;
virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
- virtual PBD::PropertyList default_properties () const;
virtual ARDOUR::RouteList selected_routes () const = 0;
virtual void sync_order_keys () = 0;
diff --git a/gtk2_ardour/route_group_menu.cc b/gtk2_ardour/route_group_menu.cc
index c50a18e3cf..f4c7611ae7 100644
--- a/gtk2_ardour/route_group_menu.cc
+++ b/gtk2_ardour/route_group_menu.cc
@@ -158,8 +158,6 @@ RouteGroupMenu::new_group ()
}
RouteGroup* g = new RouteGroup (*_session, "");
- g->apply_changes (*_default_properties);
-
RouteGroupDialog d (g, true);
if (d.do_run ()) {