Issue 4865/2: Rewrite of new translator initializations

[lilypond.git] / lily / note-performer.cc

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 1ddbb13ca3daf670056457ecd7ce54826cdc5e2c..6e1295fd088a4482bb080f9bab42af72f7ed264f 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -54,15 +54,15 @@ Note_performer::process_music ()
 
   Pitch transposing;
   SCM prop = get_property ("instrumentTransposition");
-  if (Pitch::is_smob (prop))
-    transposing = *Pitch::unsmob (prop);
+  if (unsmob<Pitch> (prop))
+    transposing = *unsmob<Pitch> (prop);
 
   for (vsize i = 0; i < note_evs_.size (); i++)
     {
       Stream_event *n = note_evs_[i];
       SCM pit = n->get_property ("pitch");
 
-      if (Pitch *pitp = Pitch::unsmob (pit))
+      if (Pitch *pitp = unsmob<Pitch> (pit))
         {
           SCM articulations = n->get_property ("articulations");
           Stream_event *tie_event = 0;
@@ -70,7 +70,7 @@ Note_performer::process_music ()
           int velocity = 0;
           for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
             {
-              Stream_event *ev = Stream_event::unsmob (scm_car (s));
+              Stream_event *ev = unsmob<Stream_event> (scm_car (s));
               if (!ev)
                 continue;
 
@@ -126,14 +126,12 @@ Note_performer::stop_translation_timestep ()
   note_evs_.clear ();
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, note)
 void
 Note_performer::listen_note (Stream_event *ev)
 {
   note_evs_.push_back (ev);
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Note_performer, breathing)
 void
 Note_performer::listen_breathing (Stream_event *ev)
 {
@@ -157,6 +155,13 @@ Note_performer::listen_breathing (Stream_event *ev)
       }
 }
 
+void
+Note_performer::boot ()
+{
+  ADD_LISTENER (Note_performer, note)
+  ADD_LISTENER (Note_performer, breathing)
+}
+
 ADD_TRANSLATOR (Note_performer,
                 /* doc */
                 "",