/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1998--2011 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
Music *mus = get_music ();
- Music *ev = unsmob_music (ev_scm);
+ Music *ev = Music::unsmob (ev_scm);
ev->set_spot (*mus->origin ());
if (d == START)
{
void
Tuplet_iterator::construct_children ()
{
- spanner_duration_ = music_get_length ();
+ 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"));
- if (mp)
- spanner_duration_ = min (mp->main_part_, spanner_duration_);
+ Moment *mp
+ = Moment::unsmob (get_outlet ()->get_property ("tupletSpannerDuration"));
+ if (mp)
+ spanner_duration_ = min (mp->main_part_, spanner_duration_);
+ }
Music_wrapper_iterator::construct_children ();