Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / lily / beam.cc

diff --git a/lily/beam.cc b/lily/beam.cc
index cf5e7c296c4728858a2499ba401f2b89a928f8d4..9dd66cef9a4124658bf447b14d81dc1f9ecac1d1 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -26,7 +26,7 @@
 
 #include "beam.hh"
 
-#include "beaming.hh"
+#include "beaming-pattern.hh"
 #include "directional-element-interface.hh"
 #include "main.hh"
 #include "international.hh"
@@ -1191,7 +1191,7 @@ Beam::set_stem_lengths (SCM smob)
 }
 
 void
-Beam::set_beaming (Grob *me, Beaming_info_list const *beaming)
+Beam::set_beaming (Grob *me, Beaming_pattern const *beaming)
 {
   extract_grob_set (me, "stems", stems);
 
@@ -1208,11 +1208,11 @@ Beam::set_beaming (Grob *me, Beaming_info_list const *beaming)
          if (beaming_prop == SCM_EOL
              || index_get_cell (beaming_prop, d) == SCM_EOL)
            {
-             int count = beaming->infos_.at (i).beam_count_drul_[d];
+             int count = beaming->beamlet_count (i, d);
              if (i > 0
                  && i < stems.size () -1
                  && Stem::is_invisible (stem))
-               count = min (count, beaming->infos_.at (i).beam_count_drul_[-d]);
+               count = min (count, beaming->beamlet_count (i,-d));
 
              if ( ((i == 0 && d == LEFT)
                    || (i == stems.size ()-1 && d == RIGHT))