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

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 09f978e9b9..70df79d95f 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -7,7 +7,6 @@
  */
 
 #include "performer.hh"
-#include "event.hh"
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
@@ -28,12 +27,20 @@ private:
   bool beam_;
 };
 
+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_)
@@ -49,17 +56,12 @@ 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;
 }
@@ -75,7 +77,7 @@ Beam_performer::try_music (Music *m)
 	{
 	  start_ev_ = m;
 	}
-      else if (d==STOP)
+      else if (d == STOP)
 	{
 	  now_stop_ev_ = m;
 	}
@@ -84,10 +86,6 @@ Beam_performer::try_music (Music *m)
   return false;
 }
 
-ENTER_DESCRIPTION (Beam_performer,"","",
+ADD_TRANSLATOR (Beam_performer,"","",
 		  "beam-event","","","");
 
-Beam_performer::Beam_performer ()
-{
-  beam_ = false;
-}