X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=9d87d3bec52cd009373ca817875f7785669ec94e;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=12066fe04aa67ed9271bc7adf1685a41a83e540c;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 12066fe04a..9d87d3bec5 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,25 +3,28 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2005 Han-Wen Nienhuys + (c) 1997--2008 Han-Wen Nienhuys */ #include "music.hh" -#include "music-sequence.hh" + +#include "context.hh" +#include "dispatcher.hh" #include "duration.hh" -#include "input-smob.hh" +#include "input.hh" +#include "international.hh" #include "ly-smobs.icc" #include "main.hh" -#include "pitch.hh" +#include "music-sequence.hh" #include "score.hh" #include "warn.hh" /* - Music is anything that has duration and supports both time compression - and transposition. + 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", + (which has a duration which can be transposed) is considered "music". */ bool Music::internal_is_music_type (SCM k) const @@ -31,66 +34,46 @@ Music::internal_is_music_type (SCM k) const return scm_c_memq (k, ifs) != SCM_BOOL_F; } -String -Music::name () const -{ - SCM nm = get_property ("name"); - if (scm_is_symbol (nm)) - { - return ly_symbol2string (nm); - } - else - { - return classname (this); - } -} - Music::Music (SCM init) + : Prob (ly_symbol2scm ("Music"), init) { - self_scm_ = SCM_EOL; - immutable_property_alist_ = init; - mutable_property_alist_ = SCM_EOL; - 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; + start_callback_ = get_property ("start-callback"); } -Music::Music (Music const &m) +void +Music::derived_mark () const { - immutable_property_alist_ = m.immutable_property_alist_; - mutable_property_alist_ = SCM_EOL; - self_scm_ = SCM_EOL; - - /* First we smobify_self, then we copy over the stuff. If we don't, - stack vars that hold the copy might be optimized away, meaning - that they won't be protected from GC. */ - smobify_self (); - mutable_property_alist_ = ly_music_deep_copy (m.mutable_property_alist_); - length_callback_ = m.length_callback_; - start_callback_ = m.start_callback_; - set_spot (*m.origin ()); + scm_gc_mark (length_callback_); + scm_gc_mark (start_callback_); } -Music::~Music () +SCM +Music::copy_mutable_properties () const { + return ly_music_deep_copy (mutable_property_alist_); } -ADD_MUSIC (Music); - -SCM -Music::get_property_alist (bool m) const +void +Music::type_check_assignment (SCM s, SCM v) const { - return (m) ? mutable_property_alist_ : immutable_property_alist_; + ::type_check_assignment (s, v, ly_symbol2scm ("music-type?")); } -SCM -Music::mark_smob (SCM m) +Music::Music (Music const &m) + : Prob (m) { - 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; + length_callback_ = m.length_callback_; + start_callback_ = m.start_callback_; + + /// why? + set_spot (*m.origin ()); } Moment @@ -100,7 +83,7 @@ Music::get_length () const if (unsmob_moment (lst)) return *unsmob_moment (lst); - if (ly_c_procedure_p (length_callback_)) + if (ly_is_procedure (length_callback_)) { SCM res = scm_call_1 (length_callback_, self_scm ()); return *unsmob_moment (res); @@ -112,8 +95,8 @@ Music::get_length () const Moment Music::start_mom () const { - SCM lst = get_property ("start-callback"); - if (ly_c_procedure_p (lst)) + SCM lst = start_callback_; + if (ly_is_procedure (lst)) { SCM res = scm_call_1 (lst, self_scm ()); return *unsmob_moment (res); @@ -136,25 +119,6 @@ print_alist (SCM a, SCM port) } } -int -Music::print_smob (SCM s, SCM p, scm_print_state*) -{ - scm_puts ("#get_property ("name"); - if (scm_is_symbol (nm) || scm_is_string (nm)) - scm_display (nm, p); - else - scm_puts (classname (m), p); - - /* Printing properties takes a lot of time, especially during backtraces. - For inspecting, it is better to explicitly use an inspection - function. */ - - scm_puts (">", p); - return 1; -} Pitch Music::generic_to_relative_octave (Pitch last) @@ -173,7 +137,7 @@ Music::generic_to_relative_octave (Pitch last) 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", + origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"", expected_pit.to_string (), new_pit.to_string ())); new_pit = expected_pit; @@ -195,7 +159,7 @@ Pitch Music::to_relative_octave (Pitch last) { SCM callback = get_property ("to-relative-callback"); - if (ly_c_procedure_p (callback)) + if (ly_is_procedure (callback)) { Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ())); return *p; @@ -218,70 +182,53 @@ Music::compress (Moment factor) set_property ("duration", d->compressed (factor.main_part_).smobbed_copy ()); } +/* + This mutates alist. Hence, make sure that it is not shared +*/ void -Music::transpose (Pitch delta) +transpose_mutable (SCM alist, Pitch delta) { - if (to_boolean (get_property ("untransposable"))) - return; - - for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s)) + 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); - + SCM new_val = val; + 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) + if (transposed.get_alteration ().abs () > Rational (1,1)) { - warning (_f ("Transposition by %s makes alteration larger than double", + 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 ())); + new_val = transposed.smobbed_copy (); + } + 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)) + new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); + + if (val != new_val) + scm_set_cdr_x (entry , new_val); } } -IMPLEMENT_TYPE_P (Music, "ly:music?"); -IMPLEMENT_SMOBS (Music); -IMPLEMENT_DEFAULT_EQUAL_P (Music); - -SCM -Music::internal_get_property (SCM sym) const -{ - SCM s = scm_sloppy_assq (sym, mutable_property_alist_); - if (s != SCM_BOOL_F) - return scm_cdr (s); - - s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); -} - void -Music::internal_set_property (SCM s, SCM v) +Music::transpose (Pitch delta) { - if (do_internal_type_checking_global) - if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) - abort (); + if (to_boolean (get_property ("untransposable"))) + return; - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); + transpose_mutable (mutable_property_alist_, delta); } void @@ -297,12 +244,54 @@ Music::origin () const return ip ? ip : &dummy_input_global; } -int -Music::duration_log () const +/* + ES TODO: This method should probably be reworked or junked. +*/ +Stream_event * +Music::to_event () const +{ + SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name")); + + // catch programming mistakes. + if (!internal_is_music_type (class_name)) + { + programming_error ("Not a music type"); + } + + 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)) + { + 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)); + } + + /* + ES TODO: This is a temporary fix. Stream_events should not be + aware of music. + */ + e->set_property ("music-cause", self_scm ()); + + return e; +} + +void +Music::send_to_context (Context *c) { - if (is_mus_type ("rhythmic-event")) - return unsmob_duration (get_property ("duration"))->duration_log (); - return 0; + Stream_event *ev = to_event (); + c->event_source ()->broadcast (ev); + ev->unprotect (); } Music * @@ -312,6 +301,27 @@ make_music_by_name (SCM sym) SCM rv = scm_call_1 (make_music_proc, sym); /* UGH. */ - scm_gc_protect_object (rv); - return unsmob_music (rv); + Music *m = unsmob_music (rv); + m->protect (); + return m; } + +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")); + + Moment mom; + if (d) + mom = d->get_length (); + return mom.smobbed_copy (); +} + +Music * +unsmob_music (SCM m) +{ + return dynamic_cast (unsmob_prob (m)); +} +