Merge branch 'issue4032'

[lilypond.git] / lily / tuplet-iterator.cc

diff --git a/lily/tuplet-iterator.cc b/lily/tuplet-iterator.cc
index bf9a223684840885a32edf9d1efbcfa5354676b0..e04a0e9de8ee57932af9a3587acdc32043e0a865 100644 (file)
--- a/lily/tuplet-iterator.cc
+++ b/lily/tuplet-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>,
+  Copyright (C) 1998--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>,
                  Erik Sandberg <mandolaerik@gmail.com>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -68,7 +68,7 @@ Tuplet_iterator::create_event (Direction d)
 
   Music *mus = get_music ();
 
-  Music *ev = unsmob_music (ev_scm);
+  Music *ev = Music::unsmob (ev_scm);
   ev->set_spot (*mus->origin ());
   if (d == START)
     {
@@ -126,14 +126,14 @@ Tuplet_iterator::process (Moment m)
 void
 Tuplet_iterator::construct_children ()
 {
-  if (Duration *d = unsmob_duration (get_music ()->get_property ("duration")))
+  if (Duration *d = Duration::unsmob (get_music ()->get_property ("duration")))
     spanner_duration_ = d->get_length ();
   else
     {
       spanner_duration_ = music_get_length ();
 
       Moment *mp
-        = unsmob_moment (get_outlet ()->get_property ("tupletSpannerDuration"));
+        = Moment::unsmob (get_outlet ()->get_property ("tupletSpannerDuration"));
       if (mp)
         spanner_duration_ = min (mp->main_part_, spanner_duration_);
     }