Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/beam-performer.cc b/lily/beam-performer.cc
index 6d36c78381774295d3d1c60411cf9bca29db0f66..0998ef3220d9e0c43adad8d230c42e3ef6c96748 100644 (file)
--- a/lily/beam-performer.cc
+++ b/lily/beam-performer.cc
@@ -10,7 +10,6 @@
 #include "audio-item.hh"
 #include "audio-column.hh"
 #include "global-context.hh"
-#include "stream-event.hh"
 #include "warn.hh"
 #include "music.hh"
 
@@ -22,13 +21,13 @@ public:
   TRANSLATOR_DECLARATIONS (Beam_performer);
 
 protected:
+  virtual bool try_music (Music *ev);
   void start_translation_timestep ();
   void process_music ();
   void set_melisma (bool);
-  DECLARE_TRANSLATOR_LISTENER (beam);
 private:
-  Stream_event *start_ev_;
-  Stream_event *now_stop_ev_;
+  Music *start_ev_;
+  Music *now_stop_ev_;
   bool beam_;
 };
 
@@ -70,16 +69,20 @@ Beam_performer::start_translation_timestep ()
   now_stop_ev_ = 0;
 }
 
-IMPLEMENT_TRANSLATOR_LISTENER (Beam_performer, beam);
-void
-Beam_performer::listen_beam (Stream_event *ev)
+bool
+Beam_performer::try_music (Music *m)
 {
-  Direction d = to_dir (ev->get_property ("span-direction"));
+  if (m->is_mus_type ("beam-event"))
+    {
+      Direction d = to_dir (m->get_property ("span-direction"));
 
-  if (d == START)
-    start_ev_ = ev;
-  else if (d == STOP)
-    now_stop_ev_ = ev;
+      if (d == START)
+       start_ev_ = m;
+      else if (d == STOP)
+       now_stop_ev_ = m;
+      return true;
+    }
+  return false;
 }
 
 ADD_TRANSLATOR (Beam_performer, "", "",