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 12b77ce27d54241545c56dd084a02922db2be6f9..8e562f4279805bfd06ba6f31bd4b96b718951f6d 100644 (file)
--- a/gtk2_ardour/rc_option_editor.cc
+++ b/gtk2_ardour/rc_option_editor.cc
@@ -543,12 +543,13 @@ public:
                /* constraint modifier */
                set_popdown_strings (_constraint_modifier_combo, dumb);
                _constraint_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::constraint_modifier_chosen));
+               std::string mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_constraint_modifier_combo,
                                                    (string_compose (_("<b>Recommended Setting: %1</b>%2"),
 #ifdef __APPLE__
                                                                     Keyboard::primary_modifier_name (),
 #else
-                                                                    Keyboard::secondary_modifier_name (),
+                                                                    Keyboard::tertiary_modifier_name (),
 #endif
                                                                     restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
@@ -571,8 +572,9 @@ public:
                set_popdown_strings (_push_points_combo, dumb);
                _push_points_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::push_points_modifier_chosen));
 
+               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::level4_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_push_points_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::push_points_modifier ()) {
                                _push_points_combo.set_active_text (S_(modifiers[x].name));
@@ -619,8 +621,10 @@ public:
                /* anchored trim */
                set_popdown_strings (_trim_anchored_combo, dumb);
                _trim_anchored_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::trim_anchored_modifier_chosen));
+
+               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::tertiary_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_trim_anchored_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::trim_anchored_modifier ()) {
                                _trim_anchored_combo.set_active_text (S_(modifiers[x].name));
@@ -664,7 +668,7 @@ public:
                set_popdown_strings (_note_size_relative_combo, dumb);
                _note_size_relative_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::note_size_relative_modifier_chosen));
                Gtkmm2ext::UI::instance()->set_tip (_note_size_relative_combo,
-                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::primary_modifier_name (), restart_msg)));
+                                                   (string_compose (_("<b>Recommended Setting: %1</b>%2"), Keyboard::tertiary_modifier_name (), restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
                        if (modifiers[x].modifier == (guint) ArdourKeyboard::note_size_relative_modifier ()) {
                                _note_size_relative_combo.set_active_text (S_(modifiers[x].name));
@@ -692,9 +696,9 @@ public:
                set_popdown_strings (_snap_modifier_combo, dumb);
                _snap_modifier_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::snap_modifier_chosen));
 #ifdef __APPLE__
-               std::string mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
+               mod_str = string_compose (X_("%1-%2"), Keyboard::level4_modifier_name (), Keyboard::tertiary_modifier_name ());
 #else
-               std::string mod_str = Keyboard::secondary_modifier_name();
+               mod_str = Keyboard::secondary_modifier_name();
 #endif
                Gtkmm2ext::UI::instance()->set_tip (_snap_modifier_combo,
                                                    (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
@@ -778,7 +782,7 @@ public:
                set_popdown_strings (_fine_adjust_combo, dumb);
                _fine_adjust_combo.signal_changed().connect (sigc::mem_fun(*this, &KeyboardOptions::fine_adjust_modifier_chosen));
 
-               mod_str = string_compose (X_("%1-%2"), Keyboard::secondary_modifier_name (), Keyboard::tertiary_modifier_name ());
+               mod_str = string_compose (X_("%1-%2"), Keyboard::primary_modifier_name (), Keyboard::secondary_modifier_name ());
                Gtkmm2ext::UI::instance()->set_tip (_fine_adjust_combo,
                                                    (string_compose (_("<b>Recommended Setting: %1</b>%2"), mod_str, restart_msg)));
                for (int x = 0; modifiers[x].name; ++x) {
@@ -1856,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 */
@@ -1886,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));
@@ -3364,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
@@ -3487,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);