insufficient attempt to drop references to a shadow MIDI port

[ardour.git] / gtk2_ardour / rc_option_editor.cc

diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc
index 7596c6fb530f5f95ba8acafa878bc87e30a62619..8e562f4279805bfd06ba6f31bd4b96b718951f6d 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -1860,14 +1860,6 @@ RCOptionEditor::RCOptionEditor ()
         , _rc_config (Config)
        , _mixer_strip_visibility ("mixer-element-visibility")
 {
-       XMLNode* node = ARDOUR_UI::instance()->preferences_settings();
-       if (node) {
-               /* gcc4 complains about ambiguity with Gtk::Widget::set_state
-                  (Gtk::StateType) here !!!
-               */
-               Tabbable::set_state (*node, Stateful::loading_state_version);
-       }
-
        UIConfiguration::instance().ParameterChanged.connect (sigc::mem_fun (*this, &RCOptionEditor::parameter_changed));
 
        /* MISC */
@@ -1890,7 +1882,7 @@ RCOptionEditor::RCOptionEditor ()
                 procs->add (0, _("all available processors"));
 
                 for (uint32_t i = 1; i <= hwcpus; ++i) {
-                        procs->add (i, string_compose (_("%1 processors"), i));
+                       procs->add (i, string_compose (P_("%1 processor", "%1 processors", i), i));
                 }
 
                procs->set_note (string_compose (_("This setting will only take effect when %1 is restarted."), PROGRAM_NAME));
@@ -3368,6 +3360,14 @@ if (!ARDOUR::Profile->get_mixbus()) {
        parameter_changed ("sync-source");
        parameter_changed ("use-monitor-bus");
        parameter_changed ("open-gui-after-adding-plugin");
+
+       XMLNode* node = ARDOUR_UI::instance()->preferences_settings();
+       if (node) {
+               /* gcc4 complains about ambiguity with Gtk::Widget::set_state
+                  (Gtk::StateType) here !!!
+               */
+               Tabbable::set_state (*node, Stateful::loading_state_version);
+       }
 }
 
 void
@@ -3491,7 +3491,7 @@ RCOptionEditor::populate_sync_options ()
 Gtk::Window*
 RCOptionEditor::use_own_window (bool and_fill_it)
 {
-       bool new_window = !own_window();
+       bool new_window = !own_window ();
 
        Gtk::Window* win = Tabbable::use_own_window (and_fill_it);