Merge branch 'master' of /home/jcharles/GIT/Lily/. into translation

[lilypond.git] / lily / time-signature.cc

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 1b2ed673f402cd1c93faacc8e43c284031a7816d..96ab19758135ee9d5811156c642dcbd5df39ab71 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -36,7 +36,7 @@ MAKE_SCHEME_CALLBACK (Time_signature, print, 1);
 SCM
 Time_signature::print (SCM smob)
 {
-  Grob *me = unsmob_grob (smob);
+  Grob *me = Grob::unsmob (smob);
   SCM st = me->get_property ("style");
   SCM frac = me->get_property ("fraction");
   int n = 4;
@@ -104,8 +104,8 @@ Time_signature::numbered_time_signature (Grob *me, int num, int den)
   SCM sd = Text_interface::interpret_markup (me->layout ()->self_scm (), chain,
                                              ly_string2scm (::to_string (den)));
 
-  Stencil n = *unsmob_stencil (sn);
-  Stencil d = *unsmob_stencil (sd);
+  Stencil n = *Stencil::unsmob (sn);
+  Stencil d = *Stencil::unsmob (sd);
 
   n.align_to (X_AXIS, CENTER);
   d.align_to (X_AXIS, CENTER);