Imported Upstream version 2.19.45

[lilypond.git] / lily / note-name-engraver.cc

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index c96b3776c0980bddfbe66f0c366b370006db1e96..2b8fa87000c8331f6c6a02e137a176e95fb83636 100644 (file)
--- a/lily/note-name-engraver.cc
+++ b/lily/note-name-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,12 +30,11 @@ public:
   TRANSLATOR_DECLARATIONS (Note_name_engraver);
 
   vector<Stream_event *> 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 = *unsmob_pitch (events_[i]->get_property ("pitch"));
+      Pitch p = *unsmob<Pitch> (events_[i]->get_property ("pitch"));
 
       if (!to_boolean (get_property ("printOctaveNames")))
         p = Pitch (-1, p.get_notename (), p.get_alteration ());
@@ -74,6 +73,12 @@ Note_name_engraver::Note_name_engraver ()
 {
 }
 
+void
+Note_name_engraver::boot ()
+{
+  ADD_LISTENER (Note_name_engraver, note);
+}
+
 ADD_TRANSLATOR (Note_name_engraver,
                 /* doc */
                 "Print pitches as words.",