X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flyric-performer.cc;h=0ad69ae0536b2efa17d95663dc2f4e0c818704d7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=6d2ff577ec9fd9d954c3ca967bbfb47042a7ac6f;hpb=64313890b232c731d432e5b096f30bffc3f3756d;p=lilypond.git

diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc
index 6d2ff577ec..0ad69ae053 100644
--- a/lily/lyric-performer.cc
+++ b/lily/lyric-performer.cc
@@ -1,14 +1,26 @@
 /*
-  lyric-performer.cc -- implement Lyric_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "audio-item.hh"
 #include "performer.hh"
-#include "music.hh"
+#include "stream-event.hh"
+#include "translator.icc"
 
 class Lyric_performer : public Performer
 {
@@ -16,12 +28,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_;
 };
 
@@ -39,7 +50,7 @@ Lyric_performer::process_music ()
       && ly_scm2string (events_[0]->get_property ("text")).length ())
     {
       audio_ = new Audio_text (Audio_text::LYRIC,
-			       ly_scm2string (events_[0]->get_property ("text")));
+                               ly_scm2string (events_[0]->get_property ("text")));
       Audio_element_info info (audio_, events_[0]);
       announce_element (info);
     }
@@ -51,24 +62,28 @@ 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,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
 
-ADD_TRANSLATOR (Lyric_performer, "", "", "lyric-event",
-		"", "");
+                /* write */
+                ""
+               );