X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=fb272aae0372af067db72aeef159af97d50271dd;hb=a7c719415cae938b6b0aff98e72eab5e5366c5a3;hp=bcee6a3d24020659ff79a3a5f73cea52340adeac;hpb=3b3e161088f1a4be942e67729d0f89f0e8d31c51;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index bcee6a3d24..fb272aae03 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,259 +3,327 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2000 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 "context.hh" +#include "dispatcher.hh" +#include "duration.hh" +#include "input.hh" +#include "international.hh" #include "ly-smobs.icc" +#include "main.hh" +#include "music-sequence.hh" +#include "score.hh" +#include "warn.hh" -SCM -ly_deep_mus_copy (SCM m) +/* + Music is anything that has (possibly zero) duration and supports + both time compression and transposition. + + 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 { - if (unsmob_music (m)) - { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_unprotect_object (ss); - return ss; - } - else if (gh_pair_p (m)) - { - return gh_cons (ly_deep_mus_copy (gh_car (m)), ly_deep_mus_copy (gh_cdr (m))); - } - else - return m; -} + 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( )); - return *unsmob_moment(res); + SCM res = scm_call_1 (length_callback_, self_scm ()); + return *unsmob_moment (res); } - - return 0; + + return Moment (0); +} + +Moment +Music::start_mom () const +{ + 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 = gh_cdr (s)) + /* SCM_EOL -> catch malformed lists. */ + for (SCM s = a; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (gh_caar (s), port); - scm_puts (" = ", port); - scm_write (gh_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; -} + SCM elt = get_property ("element"); + Pitch *old_pit = unsmob_pitch (get_property ("pitch")); + if (old_pit) + { + 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; + } + if (Music *m = unsmob_music (elt)) + last = m->to_relative_octave (last); -void -Music::transpose (Pitch ) -{ + last = music_list_to_relative (get_property ("elements"), last, false); + return last; } -IMPLEMENT_TYPE_P(Music, "music?"); -IMPLEMENT_UNSMOB(Music,music); -IMPLEMENT_SMOBS(Music); -IMPLEMENT_DEFAULT_EQUAL_P(Music); - -/****************************/ - -SCM -Music::get_mus_property (const char *nm) const +Pitch +Music::to_relative_octave (Pitch last) { - SCM sym = ly_symbol2scm (nm); - return get_mus_property (sym); + 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; + } + + return generic_to_relative_octave (last); } -SCM -Music::get_mus_property (SCM sym) const +void +Music::compress (Moment factor) { - SCM s = scm_sloppy_assq(sym, mutable_property_alist_); - if (s != SCM_BOOL_F) - return gh_cdr (s); + SCM elt = get_property ("element"); + + if (Music *m = unsmob_music (elt)) + m->compress (factor); - s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : gh_cdr (s); + 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 ()); } /* - 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. +TODO: make transposition non-destructive */ SCM -Music::remove_mus_property (const char* key) +transpose_mutable (SCM alist, Pitch delta) { - SCM val = get_mus_property (key); - if (val != SCM_EOL) - set_mus_property (key, SCM_EOL); - return val; -} + SCM retval = SCM_EOL; -void -Music::set_mus_property (const char* k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_mus_property (s, v); -} + for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) + { + SCM entry = scm_car (s); + SCM prop = scm_car (entry); + 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 ())); + } + } + else if (prop == ly_symbol2scm ("element")) + { + if (Music *m = unsmob_music (val)) + m->transpose (delta); + } + else if (prop == ly_symbol2scm ("elements")) + transpose_music_list (val, delta); + else if (prop == ly_symbol2scm ("pitch-alist") && + scm_is_pair (val)) + entry = scm_cons (prop, ly_transpose_key_alist (val, delta.smobbed_copy ())); + retval = scm_cons (entry, retval); + } -void -Music::set_immutable_mus_property (const char*k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_immutable_mus_property (s, v); + return scm_reverse_x (retval, SCM_EOL); } 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); -} -void -Music::set_mus_property (SCM s, SCM v) +Music::transpose (Pitch delta) { - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); + if (to_boolean (get_property ("untransposable"))) + return; + + mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta); } void Music::set_spot (Input ip) { - set_mus_property ("origin", make_input (ip)); + set_property ("origin", make_input (ip)); } - - -Input* +Input * Music::origin () const { - Input *ip = unsmob_input (get_mus_property ("origin")); - return ip ? ip : & dummy_input_global; + Input *ip = unsmob_input (get_property ("origin")); + return ip ? ip : &dummy_input_global; } - - - - -Music::~Music () +/* + ES TODO: This method should probably be reworked or junked. +*/ +Stream_event * +Music::to_event () const { - -} + SCM class_name = ly_camel_case_to_lisp_identifier (get_property ("name")); -SCM -ly_get_mus_property (SCM mus, SCM sym) -{ - Music * sc = unsmob_music (mus); - - if (sc) + // catch programming mistakes. + if (!internal_is_music_type (class_name)) { - return sc->get_mus_property (sym); + programming_error ("Not a music type"); } - else + + Stream_event *e = new Stream_event (class_name, mutable_property_alist_); + Moment length = get_length (); + if (length.to_bool ()) + e->set_property ("length", length.smobbed_copy ()); + + // articulations as events. + SCM art_mus = e->get_property ("articulations"); + if (scm_is_pair (art_mus)) { - warning (_("ly_get_mus_property (): Not a Music")); - scm_write (mus, scm_current_error_port ()); + SCM art_ev = SCM_EOL; + for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus)) + { + Music *m = unsmob_music (scm_car (art_mus)); + SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus); + art_ev = scm_cons (ev, art_ev); + } + e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL)); } - return SCM_EOL; -} + /* + ES TODO: This is a temporary fix. Stream_events should not be + aware of music. + */ + e->set_property ("music-cause", self_scm ()); -SCM -ly_set_mus_property (SCM mus, SCM sym, SCM val) + return e; +} + +void +Music::send_to_context (Context *c) { - Music * sc = unsmob_music (mus); + Stream_event *ev = to_event (); + c->event_source ()->broadcast (ev); + ev->unprotect (); +} - if (!gh_symbol_p (sym)) - { - warning (_("ly_set_mus_property (): Not a symbol")); - scm_write (mus, scm_current_error_port ()); +Music * +make_music_by_name (SCM sym) +{ + 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; +} - if (sc) - { - sc->set_mus_property (sym, val); - } - else - { - warning (_("ly_set_mus_property (): not of type Music")); - scm_write (mus, scm_current_error_port ()); - } +MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1); +SCM +Music::duration_length_callback (SCM m) +{ + Music *me = unsmob_music (m); + Duration *d = unsmob_duration (me->get_property ("duration")); - return SCM_UNSPECIFIED; + Moment mom; + if (d) + mom = d->get_length (); + return mom.smobbed_copy (); } -static void -init_functions () +Music * +unsmob_music (SCM m) { - scm_make_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property); - scm_make_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property); + return dynamic_cast (unsmob_prob (m)); } -ADD_SCM_INIT_FUNC(musicscm,init_functions); +