X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-sequence.cc;h=c57e18353a568dc34d9b6bccf3037b6c3a933878;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0b38de2006e642705c4eab4dc4e47a37f819df05;hpb=051d7e7cbdbbe5f5337ab2b477b0bd1e72eedd04;p=lilypond.git diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 0b38de2006..c57e18353a 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -1,64 +1,36 @@ -/* - music-sequence.cc -- implement Music_sequence - +/* + music-sequence.cc -- implement Music_sequence + source file of the GNU LilyPond music typesetter - - (c) 1998--2002 Han-Wen Nienhuys - - */ -#include "music-list.hh" -#include "warn.hh" -#include "pitch.hh" + (c) 1998--2008 Han-Wen Nienhuys +*/ -SCM -Music_sequence::music_list ()const -{ - return get_mus_property ("elements"); -} +#include "music-sequence.hh" -/* - Ugh this sucks. Linear. do not use. - */ -void -Music_sequence::append_music (Music *m) -{ - set_mus_property ("elements", - gh_append2 (music_list (), gh_cons (m->self_scm (), SCM_EOL))); - scm_gc_unprotect_object (m->self_scm ()); -} - -Music_sequence::Music_sequence ( ) - : Music () -{ -} - -void -Music_sequence::transpose (Pitch rq) -{ - transpose_list (music_list (), rq); -} +#include "warn.hh" +#include "program-option.hh" +#include "music.hh" +#include "input.hh" void -Music_sequence::transpose_list (SCM l, Pitch rq) +transpose_music_list (SCM lst, Pitch rq) { - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->transpose (rq); + 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) +Music_sequence::cumulative_length (SCM l) { Moment cumulative; - Moment last_len; + Moment last_len; - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Moment l = unsmob_music (ly_car (s))->get_length (); + Moment l = unsmob_music (scm_car (s))->get_length (); if (last_len.grace_part_ && l.main_part_) - { - last_len.grace_part_ = Rational (0); - } + last_len.grace_part_ = Rational (0); cumulative += last_len; last_len = l; } @@ -66,94 +38,105 @@ Music_sequence::cumulative_length (SCM l) last_len.grace_part_ = Rational (0); cumulative += last_len; - return cumulative; -} - -Pitch -Music_sequence::to_relative_octave (Pitch p) -{ - return do_relative_octave (p, false); + return cumulative; } - Moment Music_sequence::maximum_length (SCM l) { Moment dur = 0; - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music * m = unsmob_music (ly_car (s)); - Moment l = m->get_length (); - dur = dur >? l; + 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; } +MAKE_SCHEME_CALLBACK (Music_sequence, maximum_length_callback, 1); +SCM +Music_sequence::maximum_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + 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 (); +} + +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 (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, first_start_callback, 1); +SCM +Music_sequence::first_start_callback (SCM m) +{ + Music *me = unsmob_music (m); + return first_start (me->get_property ("elements")).smobbed_copy (); +} Pitch -Music_sequence::do_relative_octave (Pitch p, bool ret_first) +music_list_to_relative (SCM l, Pitch p, bool ret_first) { - Pitch retval; - int count=0; + Pitch first = p; + int count = 0; Pitch last = p; - for (SCM s = music_list (); gh_pair_p (s); s = ly_cdr (s)) + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music *m = unsmob_music (ly_car (s)); - if (!m) - { - programming_error ("Music_sequence should only contain music!"); - } - else + if (Music *m = unsmob_music (scm_car (s))) { last = m->to_relative_octave (last); - if (!count ++) - retval = last; + if (!count++) + first = last; } } - if (!ret_first) - retval = last; - - return retval; + return (ret_first) ? first : last; } void -Music_sequence::compress (Moment m) +compress_music_list (SCM l, Moment m) { - compress_list (music_list (), m); + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) + unsmob_music (scm_car (s))->compress (m); } -void -Music_sequence::compress_list (SCM l, Moment m) -{ - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - unsmob_music (ly_car (s))->compress (m); -} - -ADD_MUSIC (Music_sequence); - Moment Music_sequence::minimum_start (SCM l) { Moment m; - - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) - { - m = m start_mom (); - } + + 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::first_start (SCM l) +Music_sequence::first_start (SCM l) { Moment m; - - for (SCM s = l; gh_pair_p (s); s = ly_cdr (s)) + + for (SCM s = l; scm_is_pair (s); s = scm_cdr (s)) { - Music * mus = unsmob_music (ly_car (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 ()) @@ -162,3 +145,40 @@ Music_sequence::first_start (SCM l) 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 (); +} + +MAKE_SCHEME_CALLBACK (Music_sequence, event_chord_relative_callback, 2); +SCM +Music_sequence::event_chord_relative_callback (SCM music, SCM pitch) +{ + Music *me = unsmob_music (music); + Pitch p = *unsmob_pitch (pitch); + return music_list_to_relative (me->get_property ("elements"), + p, true).smobbed_copy (); +} +