From f214488d0f05af736427cf82868fee4e05e1febb Mon Sep 17 00:00:00 2001
From: Ben Loftis <ben@harrisonconsoles.com>
Date: Tue, 10 Mar 2015 15:54:54 -0500
Subject: Groups created from the (edit,mix) windows should share the same
 default properties. In the past, we chose different defaults in homage to
 ardour's old mix/edit groups. But that wasn't a very good idea. For now they
 have all properties enabled and the user can disable them as-needed. It might
 also be nice to make the user's property selections perist for new groups.

---
 gtk2_ardour/editor_group_tabs.cc | 13 -------------
 gtk2_ardour/editor_group_tabs.h  |  1 -
 gtk2_ardour/group_tabs.cc        | 20 ++++++++++++++++++++
 gtk2_ardour/group_tabs.h         |  2 +-
 gtk2_ardour/mixer_group_tabs.cc  | 14 --------------
 gtk2_ardour/mixer_group_tabs.h   |  1 -
 6 files changed, 21 insertions(+), 30 deletions(-)

(limited to 'gtk2_ardour')

diff --git a/gtk2_ardour/editor_group_tabs.cc b/gtk2_ardour/editor_group_tabs.cc
index f58c4a22d6..aa58ed2f12 100644
--- a/gtk2_ardour/editor_group_tabs.cc
+++ b/gtk2_ardour/editor_group_tabs.cc
@@ -177,19 +177,6 @@ EditorGroupTabs::add_menu_items (Gtk::Menu* m, RouteGroup* g)
 	}
 }
 
-PBD::PropertyList
-EditorGroupTabs::default_properties () const
-{
-	PBD::PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::recenable, true);
-
-	return plist;
-}
-
 RouteList
 EditorGroupTabs::selected_routes () const
 {
diff --git a/gtk2_ardour/editor_group_tabs.h b/gtk2_ardour/editor_group_tabs.h
index 3d15ef73c3..7377911f8b 100644
--- a/gtk2_ardour/editor_group_tabs.h
+++ b/gtk2_ardour/editor_group_tabs.h
@@ -36,7 +36,6 @@ private:
 		return get_height();
 	}
 	void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *);
-	PBD::PropertyList default_properties () const;
 	ARDOUR::RouteList selected_routes () const;
 	void sync_order_keys ();
 };
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index b64713362a..99a21668c1 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -395,6 +395,26 @@ 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)
 {
diff --git a/gtk2_ardour/group_tabs.h b/gtk2_ardour/group_tabs.h
index ff231e8a68..95b3ec5751 100644
--- a/gtk2_ardour/group_tabs.h
+++ b/gtk2_ardour/group_tabs.h
@@ -91,7 +91,7 @@ private:
 	virtual double extent () const = 0;
 
 	virtual void add_menu_items (Gtk::Menu *, ARDOUR::RouteGroup *) {}
-	virtual PBD::PropertyList default_properties () const = 0;
+	virtual PBD::PropertyList default_properties () const;
 	virtual ARDOUR::RouteList selected_routes () const = 0;
 	virtual void sync_order_keys () = 0;
 
diff --git a/gtk2_ardour/mixer_group_tabs.cc b/gtk2_ardour/mixer_group_tabs.cc
index da227fedbb..4b33f1e346 100644
--- a/gtk2_ardour/mixer_group_tabs.cc
+++ b/gtk2_ardour/mixer_group_tabs.cc
@@ -170,20 +170,6 @@ MixerGroupTabs::routes_for_tab (Tab const * t) const
 	return routes;
 }
 
-PropertyList
-MixerGroupTabs::default_properties () const
-{
-	PropertyList plist;
-
-	plist.add (Properties::active, true);
-	plist.add (Properties::mute, true);
-	plist.add (Properties::solo, true);
-	plist.add (Properties::gain, true);
-	plist.add (Properties::recenable, true);
-
-	return plist;
-}
-
 RouteList
 MixerGroupTabs::selected_routes () const
 {
diff --git a/gtk2_ardour/mixer_group_tabs.h b/gtk2_ardour/mixer_group_tabs.h
index 290e5a3958..5f15255c5c 100644
--- a/gtk2_ardour/mixer_group_tabs.h
+++ b/gtk2_ardour/mixer_group_tabs.h
@@ -35,7 +35,6 @@ private:
 		return get_width();
 	}
 
-	PBD::PropertyList default_properties () const;
 	ARDOUR::RouteList selected_routes () const;
 	void sync_order_keys ();
 
-- 
cgit v1.2.3