X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frepeated-music.cc;h=57bf98e73903882c0ed1b651166ecb3c9b519097;hb=08c5bc3ff87e25b1b575283f91546e5f77c591a5;hp=2560391a08c8ce07ebb210f76402ff4913f92e9f;hpb=4bb29573149a0ffa1f881c5e38a0fe68e9e76b67;p=lilypond.git diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 2560391a08..57bf98e739 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1999--2011 Han-Wen Nienhuys + Copyright (C) 1999--2014 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 @@ -35,33 +35,6 @@ 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) {