X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=f9faa7269329258d016d41b969a76d8fb6e58b79;hb=68cf7ef0e80c31fbe977f1aa3be601482440684e;hp=28551a700bc238fa1b7221e14ea9c1882046704c;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 28551a700b..f9faa72693 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,74 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "musical-request.hh"
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
-#include "array.hh"
 
-class Lyric_performer : public Performer {
+class Lyric_performer : public Performer
+{
 public:
-  VIRTUAL_COPY_CONS(Translator);
- Lyric_performer ();
-
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music* req_l);
+  virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
 
 private:
-  Link_array<Lyric_req> lreq_arr_;
-  Audio_text* audio_p_;
+  Link_array<Music> lreqs_;
+  Audio_text *audio_;
 };
 
-ADD_THIS_TRANSLATOR (Lyric_performer);
-
 Lyric_performer::Lyric_performer ()
 {
-  audio_p_ = 0;
+  audio_ = 0;
 }
 
-
 void
 Lyric_performer::create_audio_elements ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreq_arr_.size ()
-      && gh_string_p (lreq_arr_[0]->get_mus_property ("text"))
-      && ly_scm2string (lreq_arr_[0]->get_mus_property ("text")).length_i ())
+  if (lreqs_.size ()
+      && scm_is_string (lreqs_[0]->get_property ("text"))
+      && ly_scm2string (lreqs_[0]->get_property ("text")).length ())
     {
-      audio_p_ = new Audio_text (Audio_text::LYRIC,
-				 ly_scm2string (lreq_arr_[0]->get_mus_property ("text")));
-      Audio_element_info info (audio_p_, lreq_arr_[0]);
+      audio_ = new Audio_text (Audio_text::LYRIC,
+			       ly_scm2string (lreqs_[0]->get_property ("text")));
+      Audio_element_info info (audio_, lreqs_[0]);
       announce_element (info);
     }
-  lreq_arr_.clear();
+  lreqs_.clear ();
 }
 
 void
 Lyric_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
-  lreq_arr_.clear();
+  lreqs_.clear ();
 }
 
 bool
-Lyric_performer::try_music (Music* req_l)
+Lyric_performer::try_music (Music *req)
 {
-  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
+  if (req->is_mus_type ("lyric-event"))
     {
-      lreq_arr_.push (lr);
+      lreqs_.push (req);
       return true;
     }
   return false;
 }
 
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");