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

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 09f978e9b9..15c1872bf9 100644
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -1,39 +1,61 @@
 /*
-  beam-performer.cc -- implement Beam_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1996--2004 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 "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_;
 };
 
-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,51 +65,44 @@ 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)
+
+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"));
-
-      if (d == START)
-	{
-	  start_ev_ = m;
-	}
-      else if (d==STOP)
-	{
-	  now_stop_ev_ = m;
-	}
-      return true;
-    }
-  return false;
+  Direction d = to_dir (ev->get_property ("span-direction"));
+
+  if (d == START)
+    start_ev_ = ev;
+  else if (d == STOP)
+    now_stop_ev_ = ev;
 }
 
-ENTER_DESCRIPTION (Beam_performer,"","",
-		  "beam-event","","","");
+ADD_TRANSLATOR (Beam_performer,
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "",
+
+                /* write */
+                ""
+               );
 
-Beam_performer::Beam_performer ()
-{
-  beam_ = false;
-}