X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=c57e18353a568dc34d9b6bccf3037b6c3a933878;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=60e6459a20f7e850ce1a4a4ca5186c239ff91694;hpb=71fb71437fc91cef2c41d9ee17856ea1031cfb10;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 60e6459a20..c57e18353a 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,80 +1,184 @@ -/* - music-sequence.cc -- implement Music_sequence - +/* + music-sequence.cc -- implement Music_sequence + source file of the GNU LilyPond music typesetter - - (c) 1998--1999 Han-Wen Nienhuys - - */ -#include "music-list.hh" -#include "debug.hh" -#include "musical-pitch.hh" - -Music_sequence::Music_sequence (Music_sequence const&s) - : Music (s) + + (c) 1998--2008 Han-Wen Nienhuys +*/ + +#include "music-sequence.hh" + +#include "warn.hh" +#include "program-option.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, cumulative_length_callback, 1); +SCM +Music_sequence::cumulative_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); + return cumulative_length (me->get_property ("elements")).smobbed_copy (); } +MAKE_SCHEME_CALLBACK (Music_sequence, minimum_start_callback, 1); +SCM +Music_sequence::minimum_start_callback (SCM m) +{ + Music *me = unsmob_music (m); + return minimum_start (me->get_property ("elements")).smobbed_copy (); +} -void -Music_sequence::add_music (Music *m_p) +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); +SCM +Music_sequence::first_start_callback (SCM m) { - music_p_list_p_->add_music (m_p); + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); } -Moment -Music_sequence::cumulative_length () const +Pitch +music_list_to_relative (SCM l, Pitch p, bool ret_first) { - Moment last=0; - for (Cons *i = music_p_list_p_->head_; i; i = i->next_) + 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 (); + Moment m; - return dur; + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + { + Music *mus = unsmob_music (scm_car (s)); + Moment l = mus->get_length (); + Moment s = mus->start_mom (); + if (l.to_bool () || s.to_bool ()) + return s; + } + return m; +} + +MAKE_SCHEME_CALLBACK (Music_sequence, simultaneous_relative_callback, 2); +SCM +Music_sequence::simultaneous_relative_callback (SCM music, SCM pitch) +{ + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + + SCM elts = me->get_property ("elements"); + SCM copied = SCM_EOL; + if (lily_1_8_relative) + copied = ly_music_deep_copy (elts); + + Pitch retval = music_list_to_relative (elts, p, false); + + if (lily_1_8_relative) + { + + Pitch retval_1_8 = music_list_to_relative (copied, p, true); + if (retval_1_8 != retval) + lily_1_8_compatibility_used = true; + + retval = retval_1_8; + } + + return retval.smobbed_copy (); } -int -Music_sequence::length_i () const + +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_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, true).smobbed_copy (); } +