release: 1.3.93

[lilypond.git] / lily / dots.cc

diff --git a/lily/dots.cc b/lily/dots.cc
index 6a037d9f803d83504700db58d2871e042e0a14f8..25e4cec7dd18b0233ad477d6e37c782fe97ce5fe 100644 (file)
--- a/lily/dots.cc
+++ b/lily/dots.cc
@@ -16,27 +16,25 @@
 
 
 Real
-Dots::quantised_position_callback (Score_element const* me, Axis a)
+Dots::quantised_position_callback (Score_element * me, Axis a)
 {
   assert (a == Y_AXIS);
     
   SCM d= me->get_elt_property ("dot-count");
   if (gh_number_p (d) && gh_scm2int (d))
     {
-      if (!Directional_element_interface (me).get ())
-       Directional_element_interface (me).set (UP);
+      if (!Directional_element_interface::get (me))
+       Directional_element_interface::set (me, UP);
 
-      Staff_symbol_referencer_interface si (me);
-      int pos = int (si.position_f ());
-      if (!(pos % 2))
-       return si.staff_space () / 2.0 * Directional_element_interface (me).get ();
+      if (Staff_symbol_referencer::on_staffline (me))
+       return Staff_symbol_referencer::staff_space (me) / 2.0 * Directional_element_interface::get (me);
     }
 
   return  0.0;
 }
 
 
-MAKE_SCHEME_SCORE_ELEMENT_CALLBACK(Dots,brew_molecule);
+MAKE_SCHEME_CALLBACK(Dots,brew_molecule);
 SCM  
 Dots::brew_molecule (SCM d)
 {