X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=715df36c36a7f3c4dfc9028bb1fdbd5c3e6b2eb3;hb=6c68e65859bae109509e1c464fdfca6de4b5ddd1;hp=65b6bd608f3c491eb30b6dd763f8b6d22415f532;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 65b6bd608f..715df36c36 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,324 +3,265 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include "input-smob.hh" #include "music.hh" -#include "music-list.hh" -#include "debug.hh" -#include "pitch.hh" -#include "ly-smobs.icc" -SCM -ly_deep_mus_copy (SCM m) -{ - if (unsmob_music (m)) - { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (ss); - return ss; - } - else if (gh_pair_p (m)) - { - return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); - } - else - return m; -} +#include "duration.hh" +#include "input-smob.hh" +#include "international.hh" +#include "ly-smobs.icc" +#include "main.hh" +#include "music-sequence.hh" +#include "pitch.hh" +#include "score.hh" +#include "warn.hh" +/* + Music is anything that has duration and supports both time compression + and transposition. -Music::Music () + In Lily, everything that can be thought to have a length and a pitch + (which has a duration which can be transposed) is considered "music", +*/ +bool +Music::internal_is_music_type (SCM k) const { - immutable_property_alist_ = SCM_EOL; - mutable_property_alist_ = SCM_EOL; - smobify_self (); + SCM ifs = get_property ("types"); + + return scm_c_memq (k, ifs) != SCM_BOOL_F; } -Music::Music (Music const &m) +Music::Music (SCM init) + : Prob (ly_symbol2scm ("Music"), init) { - immutable_property_alist_ = m.immutable_property_alist_; - SCM c =ly_deep_mus_copy (m.mutable_property_alist_); - mutable_property_alist_ = c; - - smobify_self (); + length_callback_ = SCM_EOL; + start_callback_ = SCM_EOL; + + length_callback_ = get_property ("length-callback"); + if (!ly_is_procedure (length_callback_)) + length_callback_ = duration_length_callback_proc; - set_spot (*m.origin ()); + start_callback_ = get_property ("start-callback"); } - -Music::Music (SCM l) +void +Music::derived_mark () const { - immutable_property_alist_ = l; - mutable_property_alist_ = SCM_EOL; - smobify_self (); + scm_gc_mark (length_callback_); + scm_gc_mark (start_callback_); } - SCM -Music::mark_smob (SCM m) +Music::copy_mutable_properties () const { - Music * mus = (Music *)SCM_CELL_WORD_1 (m); - scm_gc_mark (mus->immutable_property_alist_); - scm_gc_mark (mus->mutable_property_alist_); - return SCM_EOL; + return ly_music_deep_copy (mutable_property_alist_); } -void -Music::compress (Moment) +void +Music::type_check_assignment (SCM s, SCM v) const { + if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) + abort (); } +Music::Music (Music const &m) + : Prob (m) +{ + length_callback_ = m.length_callback_; + start_callback_ = m.start_callback_; + /// why? + set_spot (*m.origin ()); +} Moment -Music::length_mom () const +Music::get_length () const { - SCM l = get_mus_property ("length"); - if (unsmob_moment (l)) - return *unsmob_moment (l); - else if (gh_procedure_p (l)) + SCM lst = get_property ("length"); + if (unsmob_moment (lst)) + return *unsmob_moment (lst); + + if (ly_is_procedure (length_callback_)) { - SCM res = gh_call1 (l, self_scm ()); + SCM res = scm_call_1 (length_callback_, self_scm ()); return *unsmob_moment (res); } - - return 0; + + return Moment (0); } Moment Music::start_mom () const { - Moment m ; + SCM lst = start_callback_; + if (ly_is_procedure (lst)) + { + SCM res = scm_call_1 (lst, self_scm ()); + return *unsmob_moment (res); + } + + Moment m; return m; } void print_alist (SCM a, SCM port) { - for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) + /* SCM_EOL -> catch malformed lists. */ + for (SCM s = a; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (ly_caar (s), port); - scm_puts (" = ", port); - scm_write (ly_cdar (s), port); + scm_display (scm_caar (s), port); + scm_puts (" = ", port); + scm_write (scm_cdar (s), port); scm_puts ("\n", port); } } -int -Music::print_smob (SCM s, SCM p, scm_print_state*) -{ - scm_puts ("#mutable_property_alist_, p); - print_alist (m->immutable_property_alist_, p); - - scm_puts (">",p); - return 1; -} Pitch -Music::to_relative_octave (Pitch m) +Music::generic_to_relative_octave (Pitch last) { - return m; -} - - -void -Music::transpose (Pitch delta) -{ - Pitch *p = unsmob_pitch (get_mus_property ("pitch")); - if (!p) - return ; - - Pitch np = *p; - np.transpose (delta); - - if (abs (np.alteration_i_) > 2) + SCM elt = get_property ("element"); + Pitch *old_pit = unsmob_pitch (get_property ("pitch")); + if (old_pit) { - warning (_f ("Transposition by %s makes accidental larger than two", - delta.str ())); + Pitch new_pit = *old_pit; + new_pit = new_pit.to_relative_octave (last); + + SCM check = get_property ("absolute-octave"); + if (scm_is_number (check) + && new_pit.get_octave () != scm_to_int (check)) + { + Pitch expected_pit (scm_to_int (check), + new_pit.get_notename (), + new_pit.get_alteration ()); + origin ()->warning (_f ("octave check failed; expected %s, found: %s", + expected_pit.to_string (), + new_pit.to_string ())); + new_pit = expected_pit; + } + + set_property ("pitch", new_pit.smobbed_copy ()); + + last = new_pit; } - set_mus_property ("pitch", np.smobbed_copy ()); -} - -IMPLEMENT_TYPE_P (Music, "music?"); - -IMPLEMENT_SMOBS (Music); -IMPLEMENT_DEFAULT_EQUAL_P (Music); + if (Music *m = unsmob_music (elt)) + last = m->to_relative_octave (last); -/****************************/ - -SCM -Music::internal_get_mus_property (SCM sym) const -{ - SCM s = scm_sloppy_assq (sym, mutable_property_alist_); - if (s != SCM_BOOL_F) - return ly_cdr (s); - - s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); + last = music_list_to_relative (get_property ("elements"), last, false); + return last; } -#if 0 -/* - Remove the value associated with KEY, and return it. The result is - that a next call will yield SCM_EOL (and not the underlying - `basic' property. -*/ -SCM -Music::remove_mus_property (const char* key) +Pitch +Music::to_relative_octave (Pitch last) { - SCM val = get_mus_property (key); - if (val != SCM_EOL) - set_mus_property (key, SCM_EOL); - return val; -} + SCM callback = get_property ("to-relative-callback"); + if (ly_is_procedure (callback)) + { + Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ())); + return *p; + } -SCM -Music::get_mus_property (const char *nm) const -{ - SCM sym = ly_symbol2scm (nm); - return get_mus_property (sym); + return generic_to_relative_octave (last); } void -Music::set_mus_property (const char* k, SCM v) +Music::compress (Moment factor) { - SCM s = ly_symbol2scm (k); - set_mus_property (s, v); -} + SCM elt = get_property ("element"); -void -Music::set_immutable_mus_property (SCM s, SCM v) -{ - immutable_property_alist_ = gh_cons (gh_cons (s,v), mutable_property_alist_); - mutable_property_alist_ = scm_assq_remove_x (mutable_property_alist_, s); -} -#endif + if (Music *m = unsmob_music (elt)) + m->compress (factor); -void -Music::internal_set_mus_property (SCM s, SCM v) -{ - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); + compress_music_list (get_property ("elements"), factor); + Duration *d = unsmob_duration (get_property ("duration")); + if (d) + set_property ("duration", d->compressed (factor.main_part_).smobbed_copy ()); } -#include "main.hh" - void -Music::set_spot (Input ip) +Music::transpose (Pitch delta) { - set_mus_property ("origin", make_input (ip)); -} - - + if (to_boolean (get_property ("untransposable"))) + return; -Input* -Music::origin () const -{ - Input *ip = unsmob_input (get_mus_property ("origin")); - return ip ? ip : & dummy_input_global; -} + for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s)) + { + SCM entry = scm_car (s); + SCM val = scm_cdr (entry); + + if (Pitch *p = unsmob_pitch (val)) + { + Pitch transposed = p->transposed (delta); + scm_set_cdr_x (entry, transposed.smobbed_copy ()); + + if (abs (transposed.get_alteration ()) > DOUBLE_SHARP) + { + warning (_f ("transposition by %s makes alteration larger than double", + delta.to_string ())); + } + } + } + SCM elt = get_property ("element"); + if (Music *m = unsmob_music (elt)) + m->transpose (delta); + transpose_music_list (get_property ("elements"), delta); + /* + UGH - how do this more generically? + */ + SCM pa = get_property ("pitch-alist"); + if (scm_is_pair (pa)) + set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ())); +} -Music::~Music () +void +Music::set_spot (Input ip) { - + set_property ("origin", make_input (ip)); } -SCM -ly_get_mus_property (SCM mus, SCM sym) +Input * +Music::origin () const { - Music * sc = unsmob_music (mus); - - if (sc) - { - return sc->internal_get_mus_property (sym); - } - else - { - warning (_ ("ly_get_mus_property (): Not a Music")); - scm_write (mus, scm_current_error_port ()); - } - return SCM_EOL; + Input *ip = unsmob_input (get_property ("origin")); + return ip ? ip : &dummy_input_global; } - -SCM -ly_set_mus_property (SCM mus, SCM sym, SCM val) +Music * +make_music_by_name (SCM sym) { - Music * sc = unsmob_music (mus); - - if (!gh_symbol_p (sym)) - { - warning (_ ("ly_set_mus_property (): Not a symbol")); - scm_write (mus, scm_current_error_port ()); - - return SCM_UNSPECIFIED; - } - - if (sc) - { - sc->internal_set_mus_property (sym, val); - } - else - { - warning (_ ("ly_set_mus_property (): not of type Music")); - scm_write (mus, scm_current_error_port ()); - } + SCM make_music_proc = ly_lily_module_constant ("make-music"); + SCM rv = scm_call_1 (make_music_proc, sym); - return SCM_UNSPECIFIED; + /* UGH. */ + Music *m = unsmob_music (rv); + m->protect (); + return m; } - -// to do property args +MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1); SCM -ly_make_music (SCM type) +Music::duration_length_callback (SCM m) { - if (!gh_string_p (type)) - { - warning (_ ("ly_make_music (): Not a string")); - scm_write (type, scm_current_error_port ()); + Music *me = unsmob_music (m); + Duration *d = unsmob_duration (me->get_property ("duration")); - return SCM_UNSPECIFIED; - } - else - { - SCM s = get_music (ly_scm2string (type))->self_scm (); - scm_gc_unprotect_object (s); - return s; - } + Moment mom; + if (d) + mom = d->get_length (); + return mom.smobbed_copy (); } -SCM -ly_music_name (SCM mus) +Music * +unsmob_music (SCM m) { - Music * m = unsmob_music (mus); - const char *nm =""; - if (!m) - { - warning (_ ("ly_music_name (): Not a music expression")); - scm_write (mus, scm_current_error_port ()); - } - else - nm = classname (m); - return ly_str02scm (nm); + return dynamic_cast (unsmob_prob (m)); } -static void -init_functions () -{ - scm_c_define_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property); - scm_c_define_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property); - scm_c_define_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music); - scm_c_define_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name); -} -ADD_SCM_INIT_FUNC (musicscm,init_functions); -ADD_MUSIC(Music);