Introduce a macro for imprecise configurations

[ardour.git] / libs / ardour / instrument_info.cc

diff --git a/libs/ardour/instrument_info.cc b/libs/ardour/instrument_info.cc
index c30994befc14b29b382f97e1418bec855d9e898d..b8c026bd029e2ee0e79f565ea4e1cc361eba164a 100644 (file)
--- a/libs/ardour/instrument_info.cc
+++ b/libs/ardour/instrument_info.cc
@@ -29,7 +29,7 @@
 #include "ardour/plugin_insert.h"
 #include "ardour/rc_configuration.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace MIDI::Name;
@@ -81,6 +81,18 @@ InstrumentInfo::get_instrument_name () const
 
 string
 InstrumentInfo::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) const
+{
+       return get_patch_name (bank, program, channel, true);
+}
+
+string
+InstrumentInfo::get_patch_name_without (uint16_t bank, uint8_t program, uint8_t channel) const
+{
+       return get_patch_name (bank, program, channel, false);
+}
+
+string
+InstrumentInfo::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel, bool with_extra) const
 {
        boost::shared_ptr<Processor> p = internal_instrument.lock();
        if (p) {
@@ -100,7 +112,11 @@ InstrumentInfo::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel)
 
 #define MIDI_BP_ZERO ((Config->get_first_midi_bank_is_zero())?0:1)
 
-               return string_compose ("prg %1 bnk %2",program + MIDI_BP_ZERO , bank + MIDI_BP_ZERO);
+               if (with_extra) {
+                       return string_compose ("prg %1 bnk %2",program + MIDI_BP_ZERO , bank + MIDI_BP_ZERO);
+               } else {
+                       return string_compose ("%1", program + MIDI_BP_ZERO);
+               }
        }
 }