X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fnote-name-engraver.cc;h=1333feb4a65b380976b8bd890dc2d5f2ecb8aa09;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=d2a6b91535c58397d86b44223ffda6973418837a;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc
index d2a6b91535..1333feb4a6 100644
--- 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--2011 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)
 {
@@ -49,11 +48,11 @@ Note_name_engraver::process_music ()
   for (vsize i = 0; i < events_.size (); i++)
     {
       if (i)
-	s += " ";
-      Pitch p = *unsmob_pitch (events_[i]->get_property ("pitch"));
+        s += " ";
+      Pitch p = *unsmob<Pitch> (events_[i]->get_property ("pitch"));
 
       if (!to_boolean (get_property ("printOctaveNames")))
-	p = Pitch (-1, p.get_notename (), p.get_alteration ());
+        p = Pitch (-1, p.get_notename (), p.get_alteration ());
 
       s += p.to_string ();
     }
@@ -70,20 +69,27 @@ 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.",
+                /* doc */
+                "Print pitches as words.",
 
-		/* create */
-		"NoteName ",
+                /* create */
+                "NoteName ",
 
-		/* read */
-		"printOctaveNames ",
+                /* read */
+                "printOctaveNames ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );