X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flyric-performer.cc;h=b318ab90fe3c651e53feb2a5da7e362d739a92f6;hb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;hp=3d41c21be6fbdd8c306ac77f99eeb57f0ac5ecb1;hpb=28976d28a04cfb9abe97af7214d7dce11f732604;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 3d41c21be6..b318ab90fe 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,47 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "event.hh"
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
-#include "array.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
-class Lyric_performer : public 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 ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 private:
-  Link_array<Music> lreqs_;
-  Audio_text* audio_;
+  vector<Stream_event *> events_;
+  Audio_text *audio_;
 };
 
-
-
-
 Lyric_performer::Lyric_performer ()
 {
   audio_ = 0;
 }
 
-
 void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreqs_.size ()
-      && 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
@@ -56,21 +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);
 }
 
-ENTER_DESCRIPTION (Lyric_performer,"","","lyric-event","","","");
+ADD_TRANSLATOR (Lyric_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);