X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=7a004c82633e03e16dc5d09ba254fb84179b0c20;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=6cf1ff9ce90a9da6a6ba1e18f095f1168f6acf97;hpb=163225c0cbb1055dfd3614615350ab9f3aaba74c;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 6cf1ff9ce9..7a004c8263 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,78 +1,77 @@ -/* - repeated-music.cc -- implement Repeated_music - +/* + repeated-music.cc -- implement Repeated_music + source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ -#include "repeated-music.hh" + (c) 1999--2009 Han-Wen Nienhuys +*/ -#include "music-list.hh" +#include "repeated-music.hh" +#include "music-sequence.hh" #include "pitch.hh" #include "warn.hh" -#include "scm-option.hh" +#include "program-option.hh" Music * -Repeated_music::body ()const +Repeated_music::body (Music *me) { - return unsmob_music (get_property ("element")); + return unsmob_music (me->get_property ("element")); } SCM -Repeated_music::alternatives ()const +Repeated_music::alternatives (Music *me) { - return get_property ("elements"); + return me->get_property ("elements"); } - - - -Pitch -Repeated_music::to_relative_octave (Pitch p) +MAKE_SCHEME_CALLBACK (Repeated_music, relative_callback, 2); +SCM +Repeated_music::relative_callback (SCM music, SCM pitch) { + Pitch p = *unsmob_pitch (pitch); + Music *me = unsmob_music (music); if (lily_1_8_relative) { - if (body ()) - p = body ()->to_relative_octave (p); + Music *body = unsmob_music (me->get_property ("element")); + if (body) + p = body->to_relative_octave (p); - Pitch last = p ; - if (alternatives ()) - { - lily_1_8_compatibility_used = true; + Pitch last = p; + SCM alternatives = me->get_property ("elements"); - for (SCM s = alternatives (); scm_is_pair (s); s = scm_cdr (s)) - unsmob_music (scm_car (s))->to_relative_octave (p); - } + for (SCM s = alternatives; scm_is_pair (s); s = scm_cdr (s)) + { + lily_1_8_compatibility_used = true; + unsmob_music (scm_car (s))->to_relative_octave (p); + } - return last; + return last.smobbed_copy (); } else - { - return Music::to_relative_octave (p); - } + return me->generic_to_relative_octave (p).smobbed_copy (); } - Moment -Repeated_music::alternatives_get_length (bool fold) const +Repeated_music::alternatives_get_length (Music *me, bool fold) { - if (!alternatives ()) + SCM alternative_list = alternatives (me); + int len = scm_ilength (alternative_list); + if (len <= 0) return 0; - + if (fold) - return Music_sequence::maximum_length (alternatives ()); + return Music_sequence::maximum_length (alternative_list); Moment m = 0; int done = 0; + int count = robust_scm2int (me->get_property ("repeat-count"), 0); - SCM p = alternatives (); - while (scm_is_pair (p) && done < repeat_count ()) + SCM p = alternative_list; + while (scm_is_pair (p) && done < count) { m = m + unsmob_music (scm_car (p))->get_length (); - done ++; - if (repeat_count () - done < scm_ilength (alternatives ())) + done++; + if (count - done < len) p = scm_cdr (p); } return m; @@ -83,106 +82,81 @@ Repeated_music::alternatives_get_length (bool fold) const of volta repeats, where the alternatives are iterated just as they were entered. */ Moment -Repeated_music::alternatives_volta_get_length () const +Repeated_music::alternatives_volta_get_length (Music *me) { - if (!alternatives ()) - return 0; - - Moment m; - SCM p = alternatives (); - while (scm_is_pair (p)) - { - m = m + unsmob_music (scm_car (p))->get_length (); - p = scm_cdr (p); - } - return m; + return Music_sequence::cumulative_length (alternatives (me)); } - /* - Length of the body in THIS. Disregards REPEAT-COUNT. - */ + Length of the body in THIS. Disregards REPEAT-COUNT. +*/ Moment -Repeated_music::body_get_length () const +Repeated_music::body_get_length (Music *me) { Moment m = 0; - if (body ()) - { - m = body ()->get_length (); - } + if (Music *body = unsmob_music (me->get_property ("element"))) + m = body->get_length (); return m; } -int -Repeated_music::repeat_count () const -{ - return scm_to_int (get_property ("repeat-count")); -} - - -MAKE_SCHEME_CALLBACK (Repeated_music,unfolded_music_length, 1); -MAKE_SCHEME_CALLBACK (Repeated_music,folded_music_length, 1); -MAKE_SCHEME_CALLBACK (Repeated_music,volta_music_length, 1); +MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); SCM Repeated_music::unfolded_music_length (SCM m) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - - Moment l = Moment (r->repeat_count ()) * r->body_get_length () + r->alternatives_get_length (false); + Music *me = unsmob_music (m); + + Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false); return l.smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); SCM Repeated_music::folded_music_length (SCM m) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - - Moment l = r->body_get_length () + r->alternatives_get_length (true); + Music *me = unsmob_music (m); + + Moment l = body_get_length (me) + alternatives_get_length (me, true); return l.smobbed_copy (); } -SCM -Repeated_music::volta_music_length (SCM m) +int +Repeated_music::repeat_count (Music *me) { - Repeated_music* r = dynamic_cast (unsmob_music (m)); - Moment l = r->body_get_length () + r->alternatives_volta_get_length (); - return l.smobbed_copy (); + return scm_to_int (me->get_property ("repeat-count")); } -ADD_MUSIC (Repeated_music); - -Repeated_music::Repeated_music () - : Music () +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); +SCM +Repeated_music::volta_music_length (SCM m) { + Music *me = unsmob_music (m); + Moment l = body_get_length (me) + alternatives_volta_get_length (me); + return l.smobbed_copy (); } - -MAKE_SCHEME_CALLBACK (Repeated_music,minimum_start, 1); -MAKE_SCHEME_CALLBACK (Repeated_music,first_start, 1); - +MAKE_SCHEME_CALLBACK (Repeated_music, minimum_start, 1); SCM Repeated_music::minimum_start (SCM m) { - Music * me = unsmob_music (m); - Music * body = unsmob_music (me->get_property ("element")); + Music *me = unsmob_music (m); + Music *body = unsmob_music (me->get_property ("element")); if (body) return body->start_mom ().smobbed_copy (); else - { - return Music_sequence::minimum_start (me->get_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_property ("element")); + Music *me = unsmob_music (m); + Music *body = unsmob_music (me->get_property ("element")); - Moment rv = (body) ? body->start_mom () : - Music_sequence::first_start (me->get_property ("elements")); + Moment rv = (body) ? body->start_mom () + : Music_sequence::first_start (me->get_property ("elements")); return rv.smobbed_copy (); }