Run `make grand-replace'.

[lilypond.git] / lily / beam-performer.cc

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 3deaa507ba4fb2e0a5e7917b51fea0467af4cd3b..907fcc4d1ad27acbac2242d12ece5ae127a9727c 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -3,37 +3,48 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1996--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1996--2008 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);
-  
+  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 +54,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;
-}