Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / lyric-performer.cc

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 35a17bc3e77c05cf5c00eab9c78e702cdb1764b4..0d14a737d2b6bfa80cd3247a19f9f93338479187 100644 (file)
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 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 *event);
   void stop_translation_timestep ();
-   void process_music ();
-
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (lyric);
 private:
-  Link_array__Music_ events_;
+  vector<Stream_event *> events_;
   Audio_text *audio_;
 };
 
@@ -51,24 +51,17 @@ Lyric_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
   events_.clear ();
 }
 
-bool
-Lyric_performer::try_music (Music *event)
+IMPLEMENT_TRANSLATOR_LISTENER (Lyric_performer, lyric);
+void
+Lyric_performer::listen_lyric (Stream_event *event)
 {
-  if (event->is_mus_type ("lyric-event"))
-    {
-      events_.push_back (event);
-      return true;
-    }
-  return false;
+  events_.push_back (event);
 }
 
-#include "translator.icc"
-
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
+ADD_TRANSLATOR (Lyric_performer, "", "",
                "", "");