X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Flyric-performer.cc;h=b318ab90fe3c651e53feb2a5da7e362d739a92f6;hb=88bcceedeb566ced9edcef51c7049a79f4fde10e;hp=c8e1acac024ad25af5a214888debaff6d470b7bd;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index c8e1acac02..b318ab90fe 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,74 +3,76 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "musical-request.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);
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
 protected:
 
-  virtual bool try_music (Music* req_l);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 private:
-  Link_array<Lyric_req> lreq_arr_;
-  Audio_text* audio_p_;
+  vector<Stream_event *> events_;
+  Audio_text *audio_;
 };
 
-
-
-
 Lyric_performer::Lyric_performer ()
 {
-  audio_p_ = 0;
+  audio_ = 0;
 }
 
-
 void
-Lyric_performer::create_audio_elements ()
+Lyric_performer::process_music ()
 {
   // FIXME: won't work with fancy lyrics
-  if (lreq_arr_.size ()
-      && gh_string_p (lreq_arr_[0]->get_mus_property ("text"))
-      && ly_scm2string (lreq_arr_[0]->get_mus_property ("text")).length_i ())
+  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,
-				 ly_scm2string (lreq_arr_[0]->get_mus_property ("text")));
-      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::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::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);
 }
 
-ENTER_DESCRIPTION(Lyric_performer,"","","","","");
+ADD_TRANSLATOR (Lyric_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);