Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index f20556a69673eb667750a1daf4b294d632030c04..9126bfbfec8e8051772978a29fe9d0a77255db6b 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -10,9 +10,9 @@
 #ifndef BEAM_HH
 #define BEAM_HH
 
+#include "grob-interface.hh"
 #include "std-vector.hh"
 #include "lily-proto.hh"
-#include "lily-guile.hh"
 #include "stem-info.hh"
 
 /*
@@ -71,10 +71,10 @@ public:
   static int visible_stem_count (Grob *);
   static Grob *first_visible_stem (Grob *);
   static Grob *last_visible_stem (Grob *);
-  static bool has_interface (Grob *);
+  DECLARE_GROB_INTERFACE();
   static void add_stem (Grob *, Grob *);
   static bool is_knee (Grob *);
-  static void set_beaming (Grob *, Beaming_info_list const *);
+  static void set_beaming (Grob *, Beaming_pattern const *);
   static void set_stemlens (Grob *);
   static int get_beam_count (Grob *me);
   static Real get_beam_translation (Grob *me);