*/
#include "repeated-music.hh"
+
#include "music-list.hh"
#include "pitch.hh"
#include "warn.hh"
-#include "music-sequence.hh"
#include "scm-option.hh"
Music *
{
lily_1_8_compatibility_used = true;
- for (SCM s = alternatives (); ly_c_pair_p (s); s = ly_cdr (s))
- unsmob_music (ly_car (s))->to_relative_octave (p);
+ for (SCM s = alternatives (); scm_is_pair (s); s = scm_cdr (s))
+ unsmob_music (scm_car (s))->to_relative_octave (p);
}
return last;
int done =0;
SCM p = alternatives ();
- while (ly_c_pair_p (p) && done < repeat_count ())
+ while (scm_is_pair (p) && done < repeat_count ())
{
- m = m + unsmob_music (ly_car (p))->get_length ();
+ m = m + unsmob_music (scm_car (p))->get_length ();
done ++;
if (repeat_count () - done < scm_ilength (alternatives ()))
- p = ly_cdr (p);
+ p = scm_cdr (p);
}
return m;
}
Moment m;
SCM p = alternatives ();
- while (ly_c_pair_p (p))
+ while (scm_is_pair (p))
{
- m = m + unsmob_music (ly_car (p))->get_length ();
- p = ly_cdr (p);
+ m = m + unsmob_music (scm_car (p))->get_length ();
+ p = scm_cdr (p);
}
return m;
}
int
Repeated_music::repeat_count () const
{
- return ly_scm2int (get_property ("repeat-count"));
+ return scm_to_int (get_property ("repeat-count"));
}