Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / editor_route_groups.cc

diff --git a/gtk2_ardour/editor_route_groups.cc b/gtk2_ardour/editor_route_groups.cc
index 041cef889253130a003189ebb3b041a507fd42e8..bdbbb5d908f6c921c249e2fd1dc02513d901fe88 100644 (file)
--- a/gtk2_ardour/editor_route_groups.cc
+++ b/gtk2_ardour/editor_route_groups.cc
@@ -26,9 +26,13 @@
 
 #include "fix_carbon.h"
 
+#include <gtkmm/stock.h>
+
 #include "gtkmm2ext/gtk_ui.h"
 #include "gtkmm2ext/cell_renderer_color_selector.h"
 
+#include "widgets/tooltips.h"
+
 #include "ardour/route_group.h"
 #include "ardour/route.h"
 #include "ardour/session.h"
@@ -41,26 +45,25 @@
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "marker.h"
-#include "prompter.h"
 #include "route_group_dialog.h"
 #include "route_time_axis.h"
 #include "time_axis_view.h"
-#include "tooltips.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
 using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtk;
 using Gtkmm2ext::Keyboard;
 
 struct ColumnInfo {
-    int         index;
-    const char* label;
-    const char* tooltip;
+       int         index;
+       const char* label;
+       const char* tooltip;
 };
 
 EditorRouteGroups::EditorRouteGroups (Editor* e)
@@ -380,21 +383,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 +566,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 +575,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