X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=32e874ee7e25b1974993f89ce7c75f61a99dd236;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=32f3ebc0e0d93c1caf412fe2b12bb397fe1c682f;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 32f3ebc0e0..32e874ee7e 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,44 +3,76 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lyric-performer.hh"
-#include "text-def.hh"
-#include "musical-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
+class Lyric_performer : public Performer
+{
+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_;
+};
 
-
-ADD_THIS_TRANSLATOR(Lyric_performer);
-
-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_requests()
+Lyric_performer::process_music ()
 {
-  if (lreq_arr_.size() && lreq_arr_[0]->text_str_.length_i())
-    play (new Audio_text (Audio_text::LYRIC, lreq_arr_[0]->text_str_));
-  lreq_arr_.clear();
+  // 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_ = new Audio_text (Audio_text::LYRIC,
+			       ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
+      announce_element (info);
+    }
+  events_.clear ();
 }
 
-bool
-Lyric_performer::do_try_music (Music* req_l)
+void
+Lyric_performer::stop_translation_timestep ()
 {
-  if (Lyric_req *lr = dynamic_cast <Lyric_req *> (req_l))
+  if (audio_)
     {
-      lreq_arr_.push (lr);
-      return true;
+      audio_ = 0;
     }
-  return false;
+  events_.clear ();
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
+void
+Lyric_performer::listen_lyric (Stream_event *event)
+{
+  events_.push_back (event);
+}
+
+ADD_TRANSLATOR (Lyric_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);