X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=935f06c35eb42e1e9a76a49a1fb715b9c988c291;hb=1010927a36e9638768229a41474b1c27c28647a3;hp=cccc64216d261dd7adc131347dba90ce8566595a;hpb=cf393d97985570aaf254a48785ad6eaa737ee4f0;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index cccc64216d..935f06c35e 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,52 +3,72 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2006 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 "music.hh"
 
+class Lyric_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Lyric_performer);
+protected:
 
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+   void process_music ();
 
-IMPLEMENT_IS_TYPE_B1(Lyric_performer,Performer);
-ADD_THIS_PERFORMER(Lyric_performer);
-
-Lyric_performer::Lyric_performer()
-{
-}
+private:
+  vector<Music*> events_;
+  Audio_text *audio_;
+};
 
-Lyric_performer::~Lyric_performer()
+Lyric_performer::Lyric_performer ()
 {
+  audio_ = 0;
 }
 
-void 
-Lyric_performer::do_print() const
+void
+Lyric_performer::process_music ()
 {
-#ifndef NPRINT
-    if ( lreq_arr_.size())
-    	lreq_arr_[ 0 ]->print();
-#endif
+  // 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 ();
 }
 
 void
-Lyric_performer::process_requests()
+Lyric_performer::stop_translation_timestep ()
 {
-    if ( lreq_arr_.size() && lreq_arr_[ 0 ]->tdef_p_->text_str_.length_i() )
-	play (new Audio_text (Audio_text::LYRIC, lreq_arr_[ 0 ]->tdef_p_->text_str_) );
-    lreq_arr_.clear();
+  if (audio_)
+    {
+      play_element (audio_);
+      audio_ = 0;
+    }
+  events_.clear ();
 }
 
 bool
-Lyric_performer::do_try_request (Request* req_l)
+Lyric_performer::try_music (Music *event)
 {
-    Musical_req* m_l = req_l->musical();
-    if ( !m_l || ! m_l->lreq_l()) 
-	return false;
-    lreq_arr_.push (m_l->lreq_l());
-
-    return true;
+  if (event->is_mus_type ("lyric-event"))
+    {
+      events_.push_back (event);
+      return true;
+    }
+  return false;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+		"", "");