X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=9ba25c5bf1f1e6c839c4a7d05b319ba8a40251be;hb=13798e90e8ae32bf341b21440f2687442274759f;hp=82477f4e43026f58be8f14c9097fdf264f14b61c;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 82477f4e43..9ba25c5bf1 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   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,13 +30,14 @@ protected:
 
   void stop_translation_timestep ();
   void process_music ();
-  DECLARE_TRANSLATOR_LISTENER (lyric);
+  void listen_lyric (Stream_event *);
 private:
   vector<Stream_event *> events_;
   Audio_text *audio_;
 };
 
-Lyric_performer::Lyric_performer ()
+Lyric_performer::Lyric_performer (Context *c)
+  : Performer (c)
 {
   audio_ = 0;
 }
@@ -50,7 +51,7 @@ Lyric_performer::process_music ()
       && ly_scm2string (events_[0]->get_property ("text")).length ())
     {
       audio_ = new Audio_text (Audio_text::LYRIC,
-			       ly_scm2string (events_[0]->get_property ("text")));
+                               ly_scm2string (events_[0]->get_property ("text")));
       Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
@@ -67,23 +68,28 @@ Lyric_performer::stop_translation_timestep ()
   events_.clear ();
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
 void
 Lyric_performer::listen_lyric (Stream_event *event)
 {
   events_.push_back (event);
 }
 
+void
+Lyric_performer::boot ()
+{
+  ADD_LISTENER (Lyric_performer, lyric);
+}
+
 ADD_TRANSLATOR (Lyric_performer,
-		/* doc */
-		"",
+                /* doc */
+                "",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );