X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=1333feb4a65b380976b8bd890dc2d5f2ecb8aa09;hb=90b609162de63ded6e3a85ac2ccf6f776f3a9f0f;hp=13d3746faf05f7a2044c995bd5f32f40c86a583e;hpb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;p=lilypond.git diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 13d3746faf..1333feb4a6 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -30,12 +30,11 @@ public: TRANSLATOR_DECLARATIONS (Note_name_engraver); vector events_; - DECLARE_TRANSLATOR_LISTENER (note); + void listen_note (Stream_event *); void process_music (); void stop_translation_timestep (); }; -IMPLEMENT_TRANSLATOR_LISTENER (Note_name_engraver, note); void Note_name_engraver::listen_note (Stream_event *ev) { @@ -50,7 +49,7 @@ Note_name_engraver::process_music () { if (i) s += " "; - Pitch p = *Pitch::unsmob (events_[i]->get_property ("pitch")); + Pitch p = *unsmob (events_[i]->get_property ("pitch")); if (!to_boolean (get_property ("printOctaveNames"))) p = Pitch (-1, p.get_notename (), p.get_alteration ()); @@ -70,10 +69,17 @@ Note_name_engraver::stop_translation_timestep () events_.clear (); } -Note_name_engraver::Note_name_engraver () +Note_name_engraver::Note_name_engraver (Context *c) + : Engraver (c) { } +void +Note_name_engraver::boot () +{ + ADD_LISTENER (Note_name_engraver, note); +} + ADD_TRANSLATOR (Note_name_engraver, /* doc */ "Print pitches as words.",