source file of the GNU LilyPond music typesetter
- (c) 1999--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "repeated-music.hh"
+
#include "music-list.hh"
#include "pitch.hh"
#include "warn.hh"
-#include "music-sequence.hh"
#include "scm-option.hh"
Music *
Repeated_music::body ()const
{
- return unsmob_music (get_mus_property ("element"));
+ return unsmob_music (get_property ("element"));
}
SCM
Repeated_music::alternatives ()const
{
- return get_mus_property ("elements");
+ return get_property ("elements");
}
-
-
-
Pitch
Repeated_music::to_relative_octave (Pitch p)
{
{
lily_1_8_compatibility_used = true;
- for (SCM s = alternatives (); gh_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;
if (fold)
return Music_sequence::maximum_length (alternatives ());
- Moment m =0;
- int done =0;
+ Moment m = 0;
+ int done = 0;
SCM p = alternatives ();
- while (gh_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 (gh_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 gh_scm2int (get_mus_property ("repeat-count"));
+ return scm_to_int (get_property ("repeat-count"));
}
ADD_MUSIC (Repeated_music);
-Repeated_music::Repeated_music ()
- : Music ()
+Repeated_music::Repeated_music (SCM x)
+ : Music (x)
{
}
MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1);
-MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1);
-
SCM
Repeated_music::minimum_start (SCM m)
{
Music * me = unsmob_music (m);
- Music * body = unsmob_music (me->get_mus_property ("element"));
+ Music * body = unsmob_music (me->get_property ("element"));
if (body)
- return body->start_mom ().smobbed_copy();
+ return body->start_mom ().smobbed_copy ();
else
{
- return Music_sequence::minimum_start (me->get_mus_property ("elements")).smobbed_copy();
+ return Music_sequence::minimum_start (me->get_property ("elements")).smobbed_copy ();
}
}
+MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1);
SCM
Repeated_music::first_start (SCM m)
{
Music * me = unsmob_music (m);
- Music * body = unsmob_music (me->get_mus_property ("element"));
+ Music * body = unsmob_music (me->get_property ("element"));
Moment rv = (body) ? body->start_mom () :
- Music_sequence::first_start (me->get_mus_property ("elements"));
+ Music_sequence::first_start (me->get_property ("elements"));
return rv.smobbed_copy ();
}