#include "music.hh"
#include "music-wrapper-iterator.hh"
#include "stream-event.hh"
+#include "lily-imports.hh"
/*
Iterates \times, by sending TupletSpanEvents at the start/end of each
Music *
Tuplet_iterator::create_event (Direction d)
{
- SCM ev_scm = scm_call_2 (ly_lily_module_constant ("make-span-event"),
- ly_symbol2scm ("TupletSpanEvent"),
- scm_from_int (d));
+ SCM ev_scm = Lily::make_span_event (ly_symbol2scm ("TupletSpanEvent"),
+ scm_from_int (d));
Music *mus = get_music ();
- Music *ev = Music::unsmob (ev_scm);
+ Music *ev = unsmob<Music> (ev_scm);
ev->set_spot (*mus->origin ());
if (d == START)
{
void
Tuplet_iterator::construct_children ()
{
- if (Duration *d = Duration::unsmob (get_music ()->get_property ("duration")))
+ if (Duration *d = unsmob<Duration> (get_music ()->get_property ("duration")))
spanner_duration_ = d->get_length ();
else if (Moment *mp
- = Moment::unsmob (get_outlet ()->get_property ("tupletSpannerDuration")))
+ = unsmob<Moment> (get_outlet ()->get_property ("tupletSpannerDuration")))
spanner_duration_ = mp->main_part_;
else
spanner_duration_.set_infinite (1);