X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-performer.cc;h=544dbfb3b128e6bad82de4c3d86bf1341d62f928;hb=87eedcd59f4082cb0841528ad5bc82cb1d1191e3;hp=8748d7320d0ebe3987bb9f523e8b40c11f8dd21e;hpb=3e07faa176c300184b2e41d0dcfa779360519359;p=lilypond.git

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 8748d7320d..544dbfb3b1 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,28 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
+#include "stream-event.hh"
 #include "warn.hh"
 
-class Beam_performer : public Performer {
+#include "translator.icc"
+
+class Beam_performer : public Performer
+{
 public:
   TRANSLATOR_DECLARATIONS (Beam_performer);
-  
+
 protected:
-  virtual bool try_music (Music *ev) ;
-  virtual void start_translation_timestep ();
-  virtual void process_music ();
+  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_;
 };
 
@@ -35,7 +38,7 @@ Beam_performer::Beam_performer ()
   now_stop_ev_ = 0;
 }
 
-void 
+void
 Beam_performer::process_music ()
 {
   if (now_stop_ev_)
@@ -51,13 +54,12 @@ Beam_performer::process_music ()
     }
 }
 
-
 void
 Beam_performer::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
@@ -66,27 +68,18 @@ Beam_performer::start_translation_timestep ()
   start_ev_ = 0;
   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;
 }
 
-ENTER_DESCRIPTION (Beam_performer,"","",
-		  "beam-event","","","");
+ADD_TRANSLATOR (Beam_performer, "", "", "", "");