X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=001eb0e5e40b183edf56e1ea21bab24b0fd01f84;hb=77267b700c377fd170abcbf4863728937038eb5e;hp=37735679138ac244d6340d516ddb90bbf7be8886;hpb=c668a48a83d7cdc70e97cb25069427c59d75c31a;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 3773567913..001eb0e5e4 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,75 +1,62 @@ -/* - repeated-music.cc -- implement Repeated_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2004 Han-Wen Nienhuys - - */ +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1999--2015 Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #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 (me->get_property ("element")); } SCM -Repeated_music::alternatives ()const +Repeated_music::alternatives (Music *me) { - return get_property ("elements"); -} - -Pitch -Repeated_music::to_relative_octave (Pitch p) -{ - if (lily_1_8_relative) - { - if (body ()) - p = body ()->to_relative_octave (p); - - Pitch last = p ; - if (alternatives ()) - { - lily_1_8_compatibility_used = true; - - for (SCM s = alternatives (); scm_is_pair (s); s = scm_cdr (s)) - unsmob_music (scm_car (s))->to_relative_octave (p); - } - - return last; - } - else - { - return Music::to_relative_octave (p); - } + return me->get_property ("elements"); } - 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 ())) - p = scm_cdr (p); + m = m + unsmob (scm_car (p))->get_length (); + done++; + if (count - done < len) + p = scm_cdr (p); } return m; } @@ -79,105 +66,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 (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 (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 (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 (SCM x) - : Music (x) +MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); +SCM +Repeated_music::volta_music_length (SCM m) { + Music *me = unsmob (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, 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 (m); + Music *body = unsmob (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); +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 (m); + Music *body = unsmob (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 (); }