(c) 2002--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
-
#include "music.hh"
#include "sequential-iterator.hh"
#include "context.hh"
SCM body = get_music ()->get_property ("element");
SCM alts = get_music ()->get_property ("elements");
int alt_count = scm_ilength (alts);
- int rep_count = ly_scm2int (get_music ()->get_property ("repeat-count"));
+ int rep_count = scm_to_int (get_music ()->get_property ("repeat-count"));
for (int i = 0; i < rep_count; i++)
{
if (alt_count)
{
- *tail = scm_cons (ly_car (alts), SCM_EOL);
+ *tail = scm_cons (scm_car (alts), SCM_EOL);
tail = SCM_CDRLOC (*tail);
if (i >= rep_count - alt_count)
- alts = ly_cdr (alts);
+ alts = scm_cdr (alts);
}
}
Volta_repeat_iterator::Volta_repeat_iterator ()
{
- done_count_ = alt_count_ = rep_count_= 0;
+ done_count_ = alt_count_ = rep_count_ = 0;
first_time_ = true;
}
SCM alts = get_music ()->get_property ("elements");
alt_count_ = scm_ilength (alts);
- rep_count_ = ly_scm2int (get_music ()->get_property ("repeat-count"));
+ rep_count_ = scm_to_int (get_music ()->get_property ("repeat-count"));
done_count_ = 0;
}
Context * where = get_outlet ()->where_defined (reps);
if (where
- && current_reps == SCM_EOL || is_pair (current_reps))
+ && current_reps == SCM_EOL || scm_is_pair (current_reps))
{
current_reps = scm_cons (what, current_reps);
where->internal_set_property (reps, current_reps);