* lily/beaming-info.cc (beamify): new function: read beatLength

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

diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc
index 7f89b9ed98802203dbafe3012be631be63cf1093..c8104d0bd09f8a877c6c50cb68f23ab9927e3caa 100644 (file)
--- a/lily/beam-engraver.cc
+++ b/lily/beam-engraver.cc
@@ -7,7 +7,7 @@
 */
 
 #include "beam.hh"
-#include "beaming.hh"
+#include "beaming-pattern.hh"
 #include "context.hh"
 #include "drul-array.hh"
 #include "duration.hh"
@@ -36,8 +36,8 @@ protected:
 
   Music *now_stop_ev_;
 
-  Beaming_info_list *beam_info_;
-  Beaming_info_list *finished_beam_info_;
+  Beaming_pattern *beam_info_;
+  Beaming_pattern *finished_beam_info_;
 
   /// location  within measure where beam started.
   Moment beam_start_location_;
@@ -145,7 +145,7 @@ Beam_engraver::process_music ()
       beam_start_location_ = mp;
       beam_start_mom_ = now_mom ();
 
-      beam_info_ = make_beaming_info_list (context ());
+      beam_info_ = new Beaming_pattern;
       /* urg, must copy to Auto_beam_engraver too */
     }
 }
@@ -158,7 +158,7 @@ Beam_engraver::typeset_beam ()
       if (!finished_beam_->get_bound (RIGHT))
        finished_beam_->set_bound (RIGHT, finished_beam_->get_bound (LEFT));
          
-      finished_beam_info_->beamify ();
+      finished_beam_info_->beamify (context ());
       Beam::set_beaming (finished_beam_, finished_beam_info_);
 
       delete finished_beam_info_;