* lily/sequential-music.cc: remove file.

[lilypond.git] / lily / include / beam.hh

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 297fd9c1be994a36f6a447967e2730f7cf184ea5..cf4740b349d025f6bbd2bcf5bfb1c66a2da90eca 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -25,7 +25,7 @@ public:
   DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
   Beam (SCM);
   static void add_stem (Grob*,Grob*);
-  static bool knee_b (Grob*);
+  static bool is_knee (Grob*);
   static void set_beaming (Grob*,Beaming_info_list *);
   static void set_stemlens (Grob*);
   static int get_beam_count (Grob*me);
@@ -56,7 +56,7 @@ public:
                                  Real yl, Real yr);
   static Real score_forbidden_quants (Real, Real,
                                      Real, Real, Real, Real,
-                                     int, Direction, Direction);
+                                     Drul_array<int>, Direction, Direction);
   
 
   static int get_direction_beam_count (Grob *me, Direction d);
@@ -74,7 +74,9 @@ private:
 
 const int REGION_SIZE = 2;
 
+#ifndef NDEBUG
 #define DEBUG_QUANTING 1
+#endif
 
 #endif /* BEAM_HH */