X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_route_groups.cc;h=3cfa1eeafaf7c45ea4bd43c065f6253c4089f87e;hb=dd72d2bf6584571b88fb383752dcb0dd892a034a;hp=041cef889253130a003189ebb3b041a507fd42e8;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 041cef8892..3cfa1eeafa 100644
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -48,7 +48,7 @@
 #include "tooltips.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -380,21 +380,22 @@ EditorRouteGroups::row_change (const Gtk::TreeModel::Path&, const Gtk::TreeModel
 	plist.add (Properties::name, string ((*iter)[_columns.text]));
 
 	bool val = (*iter)[_columns.gain];
-	plist.add (Properties::gain, val);
+	plist.add (Properties::group_gain, val);
 	val = (*iter)[_columns.gain_relative];
-	plist.add (Properties::relative, val);
+	plist.add (Properties::group_relative, val);
 	val = (*iter)[_columns.mute];
-	plist.add (Properties::mute, val);
+	plist.add (Properties::group_mute, val);
 	val = (*iter)[_columns.solo];
-	plist.add (Properties::solo, val);
+	plist.add (Properties::group_solo, val);
 	val = (*iter)[_columns.record];
-	plist.add (Properties::recenable, val);
+	plist.add (Properties::group_recenable, val);
 	val = (*iter)[_columns.monitoring];
-	plist.add (Properties::monitoring, val);
+	plist.add (Properties::group_monitoring, val);
 	val = (*iter)[_columns.select];
-	plist.add (Properties::select, val);
+	plist.add (Properties::group_select, val);
 	val = (*iter)[_columns.active_shared];
-	plist.add (Properties::route_active, val);
+	plist.add (Properties::group_route_active, val);
+
 	val = (*iter)[_columns.active_state];
 	plist.add (Properties::active, val);
 	val = (*iter)[_columns.is_visible];
@@ -562,7 +563,7 @@ EditorRouteGroups::set_session (Session* s)
 	}
 
 	PBD::PropertyChange pc;
-	pc.add (Properties::select);
+	pc.add (Properties::group_select);
 	pc.add (Properties::active);
 
 	groups_changed ();
@@ -571,9 +572,7 @@ EditorRouteGroups::set_session (Session* s)
 void
 EditorRouteGroups::run_new_group_dialog ()
 {
-	RouteList rl;
-
-	return _editor->_group_tabs->run_new_group_dialog (rl);
+	return _editor->_group_tabs->run_new_group_dialog (0, false);
 }
 
 /** Called when a model row is deleted, but also when the model is