Compile fix.

[lilypond.git] / lily / side-position-interface.cc

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index 7117d64e2f1441d8c1b4ccc336131e7e14e97794..24f3abbc997646f19084b0a27822052fcd16a419 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -103,10 +103,10 @@ Side_position_interface::general_side_position (Grob * me, Axis a, bool use_exte
   Direction dir = Side_position_interface::get_direction (me);
     
   Real off =  me->get_parent (a)->relative_coordinate (common, a);
-  SCM minimum = me->remove_grob_property ("minimum-space");
+  SCM minimum = me->get_grob_property ("minimum-space");
 
   Real total_off = dim.linear_combination (dir) - off;
-  SCM padding = me->remove_grob_property ("padding");
+  SCM padding = me->get_grob_property ("padding");
   if (gh_number_p (padding))
     {
       total_off += gh_scm2double (padding) * dir;
@@ -167,7 +167,7 @@ Side_position_interface::quantised_position (SCM element_smob, SCM)
 
   if (Staff_symbol_referencer::has_interface (me))
     {
-      Real p = Staff_symbol_referencer::position_f (me);
+      Real p = Staff_symbol_referencer::get_position (me);
       Real rp = directed_round (p, d);
       Real rad = Staff_symbol_referencer::staff_radius (me) *2 ;
       int ip = int (rp);
@@ -207,10 +207,6 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
          d = DOWN;
        }
       o += - iv[-d];
-
-      SCM pad = me->get_grob_property ("padding");
-      if (gh_number_p (pad))
-       o += d *gh_scm2double (pad) ; 
     }
   return gh_double2scm (o);
 }
@@ -218,7 +214,7 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis)
 void
 Side_position_interface::add_staff_support (Grob*me)
 {
-  Grob* st = Staff_symbol_referencer::staff_symbol_l (me);
+  Grob* st = Staff_symbol_referencer::get_staff_symbol (me);
   if (st && get_axis (me) == Y_AXIS)
     {
       add_support (me,st);