nested grace beams

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

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 3d34dbf04719c15f904f0ab7d122f471d36250f9..fe5ca56d119670bda44b18c52c84d3e1b4f8f678 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "musical-request.hh"
@@ -14,21 +14,20 @@
 
 class Lyric_performer : public Performer {
 public:
-  VIRTUAL_COPY_CONS(Translator);
- Lyric_performer ();
-
+  TRANSLATOR_DECLARATIONS(Lyric_performer);
 protected:
 
-  virtual bool do_try_music (Music* req_l);
-  virtual void do_pre_move_processing ();
-  virtual void process_acknowledged ();
+  virtual bool try_music (Music* req_l);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
 
 private:
   Link_array<Lyric_req> lreq_arr_;
   Audio_text* audio_p_;
 };
 
-ADD_THIS_TRANSLATOR (Lyric_performer);
+
+
 
 Lyric_performer::Lyric_performer ()
 {
@@ -37,7 +36,7 @@ Lyric_performer::Lyric_performer ()
 
 
 void
-Lyric_performer::process_acknowledged ()
+Lyric_performer::create_audio_elements ()
 {
   // FIXME: won't work with fancy lyrics
   if (lreq_arr_.size ()
@@ -49,22 +48,22 @@ Lyric_performer::process_acknowledged ()
       Audio_element_info info (audio_p_, lreq_arr_[0]);
       announce_element (info);
     }
-  lreq_arr_.clear();
+  lreq_arr_.clear ();
 }
 
 void
-Lyric_performer::do_pre_move_processing ()
+Lyric_performer::stop_translation_timestep ()
 {
   if (audio_p_)
     {
       play_element (audio_p_);
       audio_p_ = 0;
     }
-  lreq_arr_.clear();
+  lreq_arr_.clear ();
 }
 
 bool
-Lyric_performer::do_try_music (Music* req_l)
+Lyric_performer::try_music (Music* req_l)
 {
   if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
     {
@@ -74,3 +73,4 @@ Lyric_performer::do_try_music (Music* req_l)
   return false;
 }
 
+ENTER_DESCRIPTION(Lyric_performer,"","","","","");