X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=0d14a737d2b6bfa80cd3247a19f9f93338479187;hb=160d77656b77df6746565208a11f8fa718f71471;hp=e07fe0f4fe1df5dfd3495d024f494861ff69da71;hpb=fbb6d20e9f58d691ffe845284cbb4d8bacf9ca60;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index e07fe0f4fe..0d14a737d2 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,60 +3,65 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
-ADD_THIS_TRANSLATOR (Lyric_performer);
-
-Lyric_performer::Lyric_performer ()
+class Lyric_performer : public Performer
 {
-  audio_p_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
+
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
+private:
+  vector<Stream_event *> events_;
+  Audio_text *audio_;
+};
 
-void 
-Lyric_performer::do_print () const
+Lyric_performer::Lyric_performer ()
 {
-#ifndef NPRINT
-  if (lreq_arr_.size ())
-    lreq_arr_[0]->print ();
-#endif
+  audio_ = 0;
 }
 
 void
-Lyric_performer::do_process_music ()
+Lyric_performer::process_music ()
 {
-  if (lreq_arr_.size () && lreq_arr_[0]->text_str_.length_i ())
+  // FIXME: won't work with fancy lyrics
+  if (events_.size ()
+      && scm_is_string (events_[0]->get_property ("text"))
+      && ly_scm2string (events_[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 (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
-  lreq_arr_.clear();
+  events_.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;
+      audio_ = 0;
     }
-  lreq_arr_.clear();
+  events_.clear ();
 }
 
-bool
-Lyric_performer::do_try_music (Music* req_l)
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
+void
+Lyric_performer::listen_lyric (Stream_event *event)
 {
-  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
-    {
-      lreq_arr_.push (lr);
-      return true;
-    }
-  return false;
+  events_.push_back (event);
 }
 
+ADD_TRANSLATOR (Lyric_performer, "", "",
+		"", "");