X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=b318ab90fe3c651e53feb2a5da7e362d739a92f6;hb=58318dbf7e2d2418b72f05c0e1b4aab87328972d;hp=535801cb9f8b73e87a267abb1acefe012519d133;hpb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 535801cb9f..b318ab90fe 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
 #include "performer.hh"
-#include "music.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
 class Lyric_performer : public Performer
 {
@@ -16,12 +17,11 @@ public:
   TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music *req);
-  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 private:
-  Link_array<Music> lreqs_;
+  vector<Stream_event *> events_;
   Audio_text *audio_;
 };
 
@@ -31,19 +31,19 @@ Lyric_performer::Lyric_performer ()
 }
 
 void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
 {
   // 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 ())
+  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 (lreqs_[0]->get_property ("text")));
-      Audio_element_info info (audio_, lreqs_[0]);
+			       ly_scm2string (events_[0]->get_property ("text")));
+      Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
-  lreqs_.clear ();
+  events_.clear ();
 }
 
 void
@@ -51,23 +51,28 @@ Lyric_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
-  lreqs_.clear ();
+  events_.clear ();
 }
 
-bool
-Lyric_performer::try_music (Music *req)
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
+void
+Lyric_performer::listen_lyric (Stream_event *event)
 {
-  if (req->is_mus_type ("lyric-event"))
-    {
-      lreqs_.push (req);
-      return true;
-    }
-  return false;
+  events_.push_back (event);
 }
 
-#include "translator.icc"
+ADD_TRANSLATOR (Lyric_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
 
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event", "", "", "");
+		/* write */
+		""
+		);