* lily/rest.cc (y_offset_callback): merge function of 3 callbacks.

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

diff --git a/lily/include/beam.hh b/lily/include/beam.hh
index 83e2c591f7a9e7d52b26d7be475ff8d98fc3ac62..f27ad5748ef5df85f730cf3ccb146205cd9b3628 100644 (file)
--- a/lily/include/beam.hh
+++ b/lily/include/beam.hh
@@ -55,7 +55,7 @@ public:
   static Real get_thickness (Grob *me);
   static void connect_beams (Grob *me);
 
-  DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM axis));
+  DECLARE_SCHEME_CALLBACK (rest_collision_callback, (SCM element, SCM prev_off));
   DECLARE_SCHEME_CALLBACK (print, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_direction, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_positions, (SCM));