Fix astate setting for combo parameters when setting all astate

[ardour.git] / gtk2_ardour / route_group_dialog.cc

diff --git a/gtk2_ardour/route_group_dialog.cc b/gtk2_ardour/route_group_dialog.cc
index 9221a67948964e5d683c0c732fd2adb3ed26b630..d7fb115e9fcd4b847041dd3b65afc82567cb555a 100644 (file)
--- a/gtk2_ardour/route_group_dialog.cc
+++ b/gtk2_ardour/route_group_dialog.cc
@@ -30,7 +30,7 @@
 #include "group_tabs.h"
 #include "utils.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace ARDOUR;
@@ -126,12 +126,12 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        _active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _color.signal_color_set().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _gain.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _relative.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _mute.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
-       _route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _relative.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _mute.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _solo.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _rec_enable.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _select.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
+       _route_active.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _share_color.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
        _share_monitoring.signal_toggled().connect (sigc::mem_fun (*this, &RouteGroupDialog::update));
 
@@ -178,35 +178,27 @@ RouteGroupDialog::RouteGroupDialog (RouteGroup* g, bool creating_new)
        show_all_children ();
 }
 
-/** @return true if the route group edit was cancelled, otherwise false */
 bool
-RouteGroupDialog::do_run ()
+RouteGroupDialog::name_check () const
 {
-       while (1) {
-               int const r = run ();
+       if (unique_name (_name.get_text())) {
+               /* not cancelled and the name is ok, so all is well */
+               return true;
+       }
 
-               if (r != Gtk::RESPONSE_OK) {
-                       return true;
-               }
+       _group->set_name (_initial_name);
 
-               if (unique_name (_name.get_text())) {
-                       /* not cancelled and the name is ok, so all is well */
-                       return false;
-               }
+       MessageDialog msg (
+               _("The group name is not unique. Please use a different name."),
+               false,
+               Gtk::MESSAGE_ERROR,
+               Gtk::BUTTONS_OK,
+               true
+               );
 
-               _group->set_name (_initial_name);
-               MessageDialog msg (
-                       _("The group name is not unique. Please use a different name."),
-                       false,
-                       Gtk::MESSAGE_ERROR,
-                       Gtk::BUTTONS_OK,
-                       true
-                       );
-
-               msg.run ();
-       }
+       msg.set_position (WIN_POS_MOUSE);
+       msg.run ();
 
-       abort(); /* NOTREACHED */
        return false;
 }
 
@@ -215,17 +207,17 @@ RouteGroupDialog::update ()
 {
        PropertyList plist;
 
-       plist.add (Properties::gain, _gain.get_active());
-       plist.add (Properties::recenable, _rec_enable.get_active());
-       plist.add (Properties::mute, _mute.get_active());
-       plist.add (Properties::solo, _solo.get_active ());
-       plist.add (Properties::select, _select.get_active());
-       plist.add (Properties::route_active, _route_active.get_active());
-       plist.add (Properties::relative, _relative.get_active());
+       plist.add (Properties::group_gain, _gain.get_active());
+       plist.add (Properties::group_recenable, _rec_enable.get_active());
+       plist.add (Properties::group_mute, _mute.get_active());
+       plist.add (Properties::group_solo, _solo.get_active ());
+       plist.add (Properties::group_select, _select.get_active());
+       plist.add (Properties::group_route_active, _route_active.get_active());
+       plist.add (Properties::group_relative, _relative.get_active());
+       plist.add (Properties::group_color, _share_color.get_active());
+       plist.add (Properties::group_monitoring, _share_monitoring.get_active());
        plist.add (Properties::active, _active.get_active());
        plist.add (Properties::name, string (_name.get_text()));
-       plist.add (Properties::color, _share_color.get_active());
-       plist.add (Properties::monitoring, _share_monitoring.get_active());
 
        _group->apply_changes (plist);