X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=001eb0e5e40b183edf56e1ea21bab24b0fd01f84;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=e5ccef6c0c5e6667f7569136028968485e36d1e2;hpb=634ad74db688a5305f001917453c5cd15305c539;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index e5ccef6c0c..001eb0e5e4 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,22 +1,32 @@ -/* - repeated-music.cc -- implement Repeated_music - - source file of the GNU LilyPond music typesetter - - (c) 1999--2005 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 (Music *me) { - return unsmob_music (me->get_property ("element")); + return unsmob (me->get_property ("element")); } SCM @@ -25,44 +35,14 @@ Repeated_music::alternatives (Music *me) return me->get_property ("elements"); } -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) - { - Music *body = unsmob_music (me->get_property ("element")); - if (body) - p = body->to_relative_octave (p); - - Pitch last = p ; - SCM alternatives = me->get_property ("elements"); - - 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.smobbed_copy (); - } - else - { - return me->generic_to_relative_octave (p).smobbed_copy (); - } -} - - Moment -Repeated_music::alternatives_get_length (Music *me, bool fold) +Repeated_music::alternatives_get_length (Music *me, bool fold) { SCM alternative_list = alternatives (me); int len = scm_ilength (alternative_list); if (len <= 0) return 0; - + if (fold) return Music_sequence::maximum_length (alternative_list); @@ -73,10 +53,10 @@ Repeated_music::alternatives_get_length (Music *me, bool fold) SCM p = alternative_list; while (scm_is_pair (p) && done < count) { - m = m + unsmob_music (scm_car (p))->get_length (); - done ++; + m = m + unsmob (scm_car (p))->get_length (); + done++; if (count - done < len) - p = scm_cdr (p); + p = scm_cdr (p); } return m; } @@ -91,28 +71,24 @@ Repeated_music::alternatives_volta_get_length (Music *me) 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 (Music *me) { Moment m = 0; - if (Music *body = unsmob_music (me->get_property ("element"))) - { - m = body->get_length (); - } + if (Music *body = unsmob (me->get_property ("element"))) + m = body->get_length (); return m; } - MAKE_SCHEME_CALLBACK (Repeated_music, unfolded_music_length, 1); SCM Repeated_music::unfolded_music_length (SCM m) { - Music *me = unsmob_music (m); + Music *me = unsmob (m); Moment l = Moment (repeat_count (me)) * body_get_length (me) + alternatives_get_length (me, false); return l.smobbed_copy (); @@ -122,14 +98,14 @@ MAKE_SCHEME_CALLBACK (Repeated_music, folded_music_length, 1); SCM Repeated_music::folded_music_length (SCM m) { - Music *me = unsmob_music (m); + Music *me = unsmob (m); - Moment l = body_get_length (me) + alternatives_get_length (me, true); + Moment l = body_get_length (me) + alternatives_get_length (me, true); return l.smobbed_copy (); } int -Repeated_music::repeat_count (Music *me) +Repeated_music::repeat_count (Music *me) { return scm_to_int (me->get_property ("repeat-count")); } @@ -138,7 +114,7 @@ MAKE_SCHEME_CALLBACK (Repeated_music, volta_music_length, 1); SCM Repeated_music::volta_music_length (SCM m) { - Music *me = unsmob_music (m); + Music *me = unsmob (m); Moment l = body_get_length (me) + alternatives_volta_get_length (me); return l.smobbed_copy (); } @@ -147,26 +123,24 @@ 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); 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 (); }