X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=b40597df246bb4bd296e5f0a33b205ba057abcc2;hb=d8f40e4ee05a7a7175711859c36c1bb5a0f305ec;hp=9d5801d2f2299cc04fc51d13734e139202521331;hpb=bc1e5cfa4aef13a1b9bd2d251dd9cb25dbaf9d03;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 9d5801d2f2..b40597df24 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,86 +1,192 @@ -/* - 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 "musical-pitch.hh" - -Music_sequence::Music_sequence (Music_sequence const&s) - : Music (s) +/* + This file is part of LilyPond, the GNU music typesetter. + + Copyright (C) 1998--2012 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 +transpose_music_list (SCM lst, Pitch rq) { - music_p_list_p_ = new Music_list (*s.music_p_list_p_); + for (SCM s = lst; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->transpose (rq); } +Moment +Music_sequence::cumulative_length (SCM l) +{ + Moment cumulative; + Moment last_len; + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Moment l = unsmob_music (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; + } + + last_len.grace_part_ = Rational (0); + cumulative += last_len; + return cumulative; +} -Music_sequence::Music_sequence(Music_list *mlist_p) +Moment +Music_sequence::maximum_length (SCM l) { - music_p_list_p_ = mlist_p; + Moment dur = 0; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Music *m = unsmob_music (scm_car (s)); + if (!m) + programming_error ("Music sequence should have music elements"); + else + { + Moment l = m->get_length (); + dur = max (dur, l); + } + } + + return dur; } -void -Music_sequence::transpose (Musical_pitch rq) +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); +SCM +Music_sequence::maximum_length_callback (SCM m) { - for (Cons *i = music_p_list_p_->head_; i; i = i->next_) - i->car_->transpose (rq); + Music *me = unsmob_music (m); + return maximum_length (me->get_property ("elements")).smobbed_copy (); } -void -Music_sequence::do_print() const +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_length_callback, 1); +SCM +Music_sequence::event_chord_length_callback (SCM m) { -#ifndef NPRINT - for (Cons *i = music_p_list_p_->head_; i; i = i->next_) - i->car_->print(); -#endif + Music *me = unsmob_music (m); + Duration *d = unsmob_duration (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 (); } +MAKE_SCHEME_CALLBACK (Music_sequence, cumulative_length_callback, 1); +SCM +Music_sequence::cumulative_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); +} -void -Music_sequence::add_music (Music *m_p) +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); +SCM +Music_sequence::minimum_start_callback (SCM m) { - music_p_list_p_->add_music (m_p); + Music *me = unsmob_music (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 (Cons *i = music_p_list_p_->head_; i; i = i->next_) + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); +} + +Pitch +music_list_to_relative (SCM l, Pitch p, bool ret_first) +{ + Pitch first = p; + int count = 0; + + Pitch last = p; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - last += i->car_->length_mom (); + if (Music *m = unsmob_music (scm_car (s))) + { + last = m->to_relative_octave (last); + if (!count++) + first = last; + } } - return last; + + return (ret_first) ? first : last; } -Musical_pitch -Music_sequence::to_relative_octave (Musical_pitch p) +void +compress_music_list (SCM l, Moment m) { - return do_relative_octave (p, false); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->compress (m); } +Moment +Music_sequence::minimum_start (SCM l) +{ + Moment m; + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + m = min (m, unsmob_music (scm_car (s))->start_mom ()); + return m; +} Moment -Music_sequence::maximum_length () const +Music_sequence::first_start (SCM l) { - Moment dur = 0; - for (Cons *i = music_p_list_p_->head_; i; i = i->next_) - dur = dur >? i->car_->length_mom (); - return dur; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Music *mus = unsmob_music (scm_car (s)); + Moment start = mus->start_mom (); + if (mus->get_length ().to_bool () || start.to_bool ()) + return start; + } + return Moment (); } -int -Music_sequence::length_i () const + +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); +SCM +Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) { - return cons_list_size_i (music_p_list_p_->head_); + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, false).smobbed_copy (); } -Musical_pitch -Music_sequence::do_relative_octave (Musical_pitch p, bool b) +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) { - return music_p_list_p_->do_relative_octave (p, b); + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, true).smobbed_copy (); }