X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-performer.cc;h=bd85a6a1f1d40f69d730a05a6e7277e86a5f6283;hb=dadf069231fbb3357563070318dc11c5746c97ba;hp=0998ef3220d9e0c43adad8d230c42e3ef6c96748;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 0998ef3220..bd85a6a1f1 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,15 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
-#include "music.hh"
 
 #include "translator.icc"
 
@@ -21,13 +21,13 @@ public:
   TRANSLATOR_DECLARATIONS (Beam_performer);
 
 protected:
-  virtual bool try_music (Music *ev);
   void start_translation_timestep ();
   void process_music ();
   void set_melisma (bool);
+  DECLARE_TRANSLATOR_LISTENER (beam);
 private:
-  Music *start_ev_;
-  Music *now_stop_ev_;
+  Stream_event *start_ev_;
+  Stream_event *now_stop_ev_;
   bool beam_;
 };
 
@@ -69,22 +69,29 @@ Beam_performer::start_translation_timestep ()
   now_stop_ev_ = 0;
 }
 
-bool
-Beam_performer::try_music (Music *m)
+IMPLEMENT_TRANSLATOR_LISTENER (Beam_performer, beam);
+void
+Beam_performer::listen_beam (Stream_event *ev)
 {
-  if (m->is_mus_type ("beam-event"))
-    {
-      Direction d = to_dir (m->get_property ("span-direction"));
+  Direction d = to_dir (ev->get_property ("span-direction"));
 
-      if (d == START)
-	start_ev_ = m;
-      else if (d == STOP)
-	now_stop_ev_ = m;
-      return true;
-    }
-  return false;
+  if (d == START)
+    start_ev_ = ev;
+  else if (d == STOP)
+    now_stop_ev_ = ev;
 }
 
-ADD_TRANSLATOR (Beam_performer, "", "",
-		"beam-event", "", "");
+ADD_TRANSLATOR (Beam_performer,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+                );