X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=644ba9beb727e5982603ba69485a1c4dfdda15b2;hb=074edde46fd433dbf52c482f3b087e80587db001;hp=5ce5b1a8b9baeff18e7f72929cfe73471bfb2a41;hpb=1161a2b71bc32575ea9878a8631221edb8c03279;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 5ce5b1a8b9..644ba9beb7 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,125 +1,193 @@ -/* - music-sequence.cc -- implement Music_sequence - - source file of the GNU LilyPond music typesetter - - (c) 1998--2000 Han-Wen Nienhuys - - */ -#include "music-list.hh" -#include "debug.hh" -#include "pitch.hh" +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--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 "music-sequence.hh" + +#include "warn.hh" +#include "program-option.hh" +#include "duration.hh" +#include "moment.hh" +#include "music.hh" +#include "input.hh" void -Music_sequence::truncate (int k) +transpose_music_list (SCM lst, Pitch rq) +{ + for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) + if (Prob *p = unsmob (scm_car (s))) + p->transpose (rq); +} + +Moment +Music_sequence::cumulative_length (SCM l) { - SCM l = get_mus_property ("elements"); - if (k == 0) + Moment cumulative; + Moment last_len; + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - l = SCM_EOL; + Moment l = unsmob (scm_car (s))->get_length (); + if (last_len.grace_part_ && l.main_part_) + last_len.grace_part_ = Rational (0); + cumulative += last_len; + last_len = l; } - else + + last_len.grace_part_ = Rational (0); + cumulative += last_len; + + return cumulative; +} + +Moment +Music_sequence::maximum_length (SCM l) +{ + Moment dur = 0; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - SCM s = l; - k--; - for (; gh_pair_p (s) && k--; s = gh_cdr (s)) - ; - - if (gh_pair_p (s)) - { - gh_set_cdr_x (s, SCM_EOL); - } + Music *m = unsmob (scm_car (s)); + if (!m) + programming_error ("Music sequence should have music elements"); + else + { + Moment l = m->get_length (); + dur = max (dur, l); + } } - set_mus_property ("elements", l); + + return dur; } +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); SCM -Music_sequence::music_list ()const +Music_sequence::maximum_length_callback (SCM m) { - return get_mus_property ("elements"); + Music *me = unsmob (m); + return maximum_length (me->get_property ("elements")).smobbed_copy (); } -/* - Ugh this sucks. Linear. do not use. - */ -void -Music_sequence::append_music (Music *m) +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_length_callback, 1); +SCM +Music_sequence::event_chord_length_callback (SCM m) { - set_mus_property ("elements", - gh_append2( music_list(), gh_cons (m->self_scm (), SCM_EOL))); - scm_unprotect_object (m->self_scm ()); + Music *me = unsmob (m); + Duration *d = unsmob (me->get_property ("duration")); + // Preset duration is used in chord repetitions. + if (d) + { + Moment mom = d->get_length (); + return mom.smobbed_copy (); + } + return maximum_length (me->get_property ("elements")).smobbed_copy (); } -Music_sequence::Music_sequence(SCM l) - : Music (l) +MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1); +SCM +Music_sequence::cumulative_length_callback (SCM m) { + Music *me = unsmob (m); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); } -void -Music_sequence::transpose (Pitch rq) +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); +SCM +Music_sequence::minimum_start_callback (SCM m) { - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->transpose (rq); + Music *me = unsmob (m); + return minimum_start (me->get_property ("elements")).smobbed_copy (); } - - - -Moment -Music_sequence::cumulative_length () const +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); +SCM +Music_sequence::first_start_callback (SCM m) { - Moment last=0; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - last += unsmob_music (gh_car (s))->length_mom (); - return last; + Music *me = unsmob (m); + return first_start (me->get_property ("elements")).smobbed_copy (); } Pitch -Music_sequence::to_relative_octave (Pitch p) +music_list_to_relative (SCM l, Pitch p, bool ret_first) { - return do_relative_octave (p, false); + Pitch first = p; + int count = 0; + + Pitch last = p; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + if (Music *m = unsmob (scm_car (s))) + { + last = m->to_relative_octave (last); + if (!count++) + first = last; + } + } + + return (ret_first) ? first : last; } +void +compress_music_list (SCM l, Moment m) +{ + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + unsmob (scm_car (s))->compress (m); +} Moment -Music_sequence::maximum_length () const +Music_sequence::minimum_start (SCM l) { - Moment dur = 0; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - dur = dur >? unsmob_music (gh_car (s))->length_mom (); + Moment m; - return dur; -} -int -Music_sequence::length_i () const -{ - return scm_ilength (music_list ()); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + m = min (m, unsmob (scm_car (s))->start_mom ()); + return m; } -Pitch -Music_sequence::do_relative_octave (Pitch p, bool ret_first) +Moment +Music_sequence::first_start (SCM l) { - Pitch retval; - int count=0; - Pitch last = p; - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - last = unsmob_music (gh_car (s))->to_relative_octave (last); - if (!count ++ ) - retval = last; + Music *mus = unsmob (scm_car (s)); + Moment start = mus->start_mom (); + if (mus->get_length ().to_bool () || start.to_bool ()) + return start; } + return Moment (); +} - if (!ret_first) - retval = last; - - return retval; +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); +SCM +Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) +{ + Music *me = unsmob (music); + Pitch p = *unsmob (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, false).smobbed_copy (); } -void -Music_sequence::compress (Moment m) +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) { - for (SCM s = music_list (); gh_pair_p (s); s = gh_cdr (s)) - unsmob_music (gh_car (s))->compress (m); + Music *me = unsmob (music); + Pitch p = *unsmob (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, true).smobbed_copy (); }