X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fbeam-performer.cc;h=0998ef3220d9e0c43adad8d230c42e3ef6c96748;hb=75eebcb49e52d296b1da3e1074e0825d2c780db4;hp=09f978e9b92326e1e0e320389bb99f8729b37739;hpb=947454c5cc430a9627262de4f25274a64789d3c2;p=lilypond.git

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 09f978e9b9..0998ef3220 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,24 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
 #include "warn.hh"
+#include "music.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 ();
+  virtual bool try_music (Music *ev);
+  void start_translation_timestep ();
+  void process_music ();
   void set_melisma (bool);
 private:
   Music *start_ev_;
@@ -28,12 +31,20 @@ private:
   bool beam_;
 };
 
-void 
+Beam_performer::Beam_performer ()
+{
+  beam_ = false;
+  start_ev_ = 0;
+  now_stop_ev_ = 0;
+}
+
+void
 Beam_performer::process_music ()
 {
   if (now_stop_ev_)
     {
       beam_ = false;
+      set_melisma (false);
     }
 
   if (start_ev_)
@@ -43,27 +54,21 @@ Beam_performer::process_music ()
     }
 }
 
-
 void
 Beam_performer::set_melisma (bool ml)
 {
   SCM b = get_property ("autoBeaming");
   if (!to_boolean (b))
-    daddy_context_->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T :SCM_BOOL_F);
+    context ()->set_property ("beamMelismaBusy", ml ? SCM_BOOL_T : SCM_BOOL_F);
 }
 
 void
 Beam_performer::start_translation_timestep ()
 {
-  if (beam_)
-    {
-      set_melisma (true);
-    }
-  
   start_ev_ = 0;
   now_stop_ev_ = 0;
 }
- 
+
 bool
 Beam_performer::try_music (Music *m)
 {
@@ -72,22 +77,14 @@ Beam_performer::try_music (Music *m)
       Direction d = to_dir (m->get_property ("span-direction"));
 
       if (d == START)
-	{
-	  start_ev_ = m;
-	}
-      else if (d==STOP)
-	{
-	  now_stop_ev_ = m;
-	}
+	start_ev_ = m;
+      else if (d == STOP)
+	now_stop_ev_ = m;
       return true;
     }
   return false;
 }
 
-ENTER_DESCRIPTION (Beam_performer,"","",
-		  "beam-event","","","");
+ADD_TRANSLATOR (Beam_performer, "", "",
+		"beam-event", "", "");
 
-Beam_performer::Beam_performer ()
-{
-  beam_ = false;
-}