NO-OP: mark various state property names as explicitly non-translated

[ardour.git] / gtk2_ardour / patch_change_widget.cc

diff --git a/gtk2_ardour/patch_change_widget.cc b/gtk2_ardour/patch_change_widget.cc
index 5d8f77b13c8c1b92ec322878a1b1cf75a664fb6a..f82db6a27a699816c5d2ebc655f817ec40e130f4 100644 (file)
--- a/gtk2_ardour/patch_change_widget.cc
+++ b/gtk2_ardour/patch_change_widget.cc
@@ -32,6 +32,7 @@
 #include "ardour/plugin_insert.h"
 
 #include "gtkmm2ext/menu_elems.h"
+#include "gtkmm2ext/utils.h"
 #include "widgets/tooltips.h"
 
 #include "gui_thread.h"
@@ -268,7 +269,8 @@ PatchChangeWidget::refill_program_list ()
 
                        const uint8_t pgm = key.program();
                        _program_btn[pgm].set_text (n);
-                       set_tooltip (_program_btn[pgm], string_compose (_("%1 (Pgm-%2)"), n, (int)(pgm +1)));
+                       set_tooltip (_program_btn[pgm], string_compose (_("%1 (Pgm-%2)"),
+                                               Gtkmm2ext::markup_escape_text (n), (int)(pgm +1)));
                        unset_notes.reset (pgm);
                }
        }
@@ -466,7 +468,7 @@ PatchChangeWidget::audition_next ()
                piano_keyboard_set_note_off (_piano, _audition_note_num);
                return ++_audition_note_num <= _audition_end_spin.get_value_as_int() && _audition_enable.get_active ();
        } else {
-               note_on_event_handler (_audition_note_num);
+               note_on_event_handler (_audition_note_num, true);
                piano_keyboard_set_note_on (_piano, _audition_note_num);
                return true;
        }
@@ -475,7 +477,7 @@ PatchChangeWidget::audition_next ()
 void
 PatchChangeWidget::_note_on_event_handler(GtkWidget*, int note, gpointer arg)
 {
-       ((PatchChangeWidget*)arg)->note_on_event_handler(note);
+       ((PatchChangeWidget*)arg)->note_on_event_handler(note, false);
 }
 
 void
@@ -485,10 +487,12 @@ PatchChangeWidget::_note_off_event_handler(GtkWidget*, int note, gpointer arg)
 }
 
 void
-PatchChangeWidget::note_on_event_handler (int note)
+PatchChangeWidget::note_on_event_handler (int note, bool for_audition)
 {
-       cancel_audition ();
-       _pianomm->grab_focus ();
+       if (!for_audition) {
+               cancel_audition ();
+               _pianomm->grab_focus ();
+       }
        uint8_t event[3];
        event[0] = (MIDI_CMD_NOTE_ON | _channel);
        event[1] = note;