X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-item.cc;h=33dd9f11bde71fedb14e67b0174fc4b0e277fc1a;hb=8379d72964ea43cb455cfc9beb7143f1ce76c834;hp=d85161676cc3943e42a669b56d88ba2e187c80c4;hpb=e8d5061834a5a658c5ffd078237e9cd660069a7d;p=lilypond.git diff --git a/lily/midi-item.cc b/lily/midi-item.cc index d85161676c..33dd9f11bd 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -28,6 +28,7 @@ #include "program-option.hh" #include "string-convert.hh" #include "warn.hh" +#include "lily-imports.hh" #define PITCH_WHEEL_CENTER 0x2000 #define PITCH_WHEEL_SEMITONE 0X1000 @@ -84,8 +85,7 @@ Midi_instrument::to_string () const Byte program_byte = 0; bool found = false; - SCM proc = ly_lily_module_constant ("midi-program"); - SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ())); + SCM program = Lily::midi_program (ly_symbol2scm (audio_->str_.c_str ())); found = (scm_is_true (program)); if (found) program_byte = (Byte) scm_to_int (program); @@ -426,5 +426,5 @@ Midi_control_function_value_change::to_string () const char const * Midi_item::name () const { - return this->class_name (); + return class_name (); }