X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=f9faa7269329258d016d41b969a76d8fb6e58b79;hb=4516c9ff0c6b1cfc9b0245486a37a90cf487318e;hp=4569505c4adb4738c0a6a2b682f1b70c9fe05fe7;hpb=f988425624a6f6d1a48aea0ac0c1c84ff0857e56;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 4569505c4a..f9faa72693 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,68 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
 
-ADD_THIS_TRANSLATOR (Lyric_performer);
+class Lyric_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
+
+  virtual bool try_music (Music *req);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+private:
+  Link_array<Music> lreqs_;
+  Audio_text *audio_;
+};
 
 Lyric_performer::Lyric_performer ()
 {
-  audio_p_ = 0;
+  audio_ = 0;
 }
 
-
 void
-Lyric_performer::do_process_music ()
+Lyric_performer::create_audio_elements ()
 {
-  if (lreq_arr_.size () && lreq_arr_[0]->text_str_.length_i ())
+  // FIXME: won't work with fancy lyrics
+  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, lreq_arr_[0]->text_str_);
-      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::do_pre_move_processing ()
+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::do_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", "", "", "");