X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=83f88fbcd91a06e66988d8c6f52b6de4264d5f2f;hb=c2ccda3e91d408453744bd03882c6b0584a9561a;hp=081655e0b308941b565e8bf2c31cd8df95a34da1;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 081655e0b3..83f88fbcd9 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,331 +3,328 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2003 Han-Wen Nienhuys + (c) 1997--2006 Han-Wen Nienhuys */ -#include "main.hh" -#include "input-smob.hh" #include "music.hh" -#include "music-list.hh" -#include "warn.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) -{ - 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; -} +/* + 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 +Music::internal_is_music_type (SCM k) const { - SCM ifs = get_mus_property ("types"); + SCM ifs = get_property ("types"); - return scm_memq (k, ifs) != SCM_BOOL_F; + return scm_c_memq (k, ifs) != SCM_BOOL_F; } -String -Music::name () const +Music::Music (SCM init) + : Prob (ly_symbol2scm ("Music"), init) { - SCM nm = get_mus_property ("name"); - if (gh_symbol_p (nm)) - { - return ly_symbol2string (nm); - } - else - { - return classname (this); - } -} + 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; -void -Music::transpose (Pitch) -{ + start_callback_ = get_property ("start-callback"); } void -Music::compress (Moment) +Music::derived_mark () const { + scm_gc_mark (length_callback_); + scm_gc_mark (start_callback_); } - -Music::Music (Music const &m) +SCM +Music::copy_mutable_properties () 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_deep_mus_copy (m.mutable_property_alist_); - set_spot (*m.origin ()); + return ly_music_deep_copy (mutable_property_alist_); } -Music::Music () +void +Music::type_check_assignment (SCM s, SCM v) const { - self_scm_ = SCM_EOL; - immutable_property_alist_ = SCM_EOL; - mutable_property_alist_ = SCM_EOL; - smobify_self (); + if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) + abort (); } -SCM -Music::get_property_alist (bool m) const +Music::Music (Music const &m) + : Prob (m) { - return (m) ? mutable_property_alist_ : immutable_property_alist_; -} + length_callback_ = m.length_callback_; + start_callback_ = m.start_callback_; -SCM -Music::mark_smob (SCM 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; + /// why? + set_spot (*m.origin ()); } Moment 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 { - SCM l = get_mus_property ("start-moment-function"); - if (gh_procedure_p (l)) + SCM lst = start_callback_; + if (ly_is_procedure (lst)) { - SCM res = gh_call1 (l, self_scm ()); + SCM res = scm_call_1 (lst, self_scm ()); return *unsmob_moment (res); } - Moment m ; + Moment m; return m; } void print_alist (SCM a, SCM port) { - /* - SCM_EOL -> catch malformed lists. - */ - 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*) + +Pitch +Music::generic_to_relative_octave (Pitch last) { - scm_puts ("#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; + } - print_alist (m->mutable_property_alist_, p); - print_alist (m->immutable_property_alist_, p); - - scm_puts (">",p); - return 1; + if (Music *m = unsmob_music (elt)) + last = m->to_relative_octave (last); + + last = music_list_to_relative (get_property ("elements"), last, false); + return last; } Pitch -Music::to_relative_octave (Pitch m) +Music::to_relative_octave (Pitch last) { - return m; -} + 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); +} -IMPLEMENT_TYPE_P (Music, "ly:music?"); +void +Music::compress (Moment factor) +{ + SCM elt = get_property ("element"); -IMPLEMENT_SMOBS (Music); -IMPLEMENT_DEFAULT_EQUAL_P (Music); + if (Music *m = unsmob_music (elt)) + m->compress (factor); -/****************************/ + 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 ()); +} +/* + This mutates alist. Hence, make sure that it is not changed +*/ SCM -Music::internal_get_mus_property (SCM sym) const +transpose_mutable (SCM alist, Pitch delta) { - SCM s = scm_sloppy_assq (sym, mutable_property_alist_); - if (s != SCM_BOOL_F) - return ly_cdr (s); + SCM retval = SCM_EOL; - s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : ly_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); + + if (Pitch *p = unsmob_pitch (val)) + { + Pitch transposed = p->transposed (delta); + scm_set_cdr_x (entry, transposed.smobbed_copy ()); + + if (transposed.get_alteration ().abs () > Rational (1,1)) + { + 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); + } + + return scm_reverse_x (retval, SCM_EOL); } void -Music::internal_set_mus_property (SCM s, SCM v) +Music::transpose (Pitch delta) { - if (internal_type_checking_global_b) - 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); + mutable_property_alist_ = transpose_mutable (mutable_property_alist_, delta); } - - -#include "main.hh" - 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; -} - - -Music::~Music () -{ - + Input *ip = unsmob_input (get_property ("origin")); + return ip ? ip : &dummy_input_global; } -LY_DEFINE(ly_get_mus_property, - "ly:get-mus-property", 2, 0, 0, (SCM mus, SCM sym), - "Get the property @var{sym} of music expression @var{mus}.") +/* + ES TODO: This method should probably be reworked or junked. +*/ +Stream_event * +Music::to_event () const { - Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM class_name = ly_camel_case_to_lisp_identifier (get_property ("name")); - return sc->internal_get_mus_property (sym); -} + // catch programming mistakes. + if (!internal_is_music_type (class_name)) + { + programming_error ("Not a music type"); + } -LY_DEFINE(ly_set_mus_property, - "ly:set-mus-property!", 3, 0, 0, - (SCM mus, SCM sym, SCM val), - "Set property @var{sym} in music expression @var{mus} to @var{val}.") -{ - Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + 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 ()); - bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); - if (ok) + // articulations as events. + SCM art_mus = e->get_property ("articulations"); + if (scm_is_pair (art_mus)) { - sc->internal_set_mus_property (sym, val); + 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_UNSPECIFIED; -} + /* + ES TODO: This is a temporary fix. Stream_events should not be + aware of music. + */ + e->set_property ("music-cause", self_scm ()); -LY_DEFINE(ly_music_name, "ly:music-name", 1, 0, 0, - (SCM mus), - "Return the name of @var{music}.") -{ - Music * m = unsmob_music (mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); - - const char * nm = classname (m); - return scm_makfrom0str (nm); + return e; } - - -// to do property args -LY_DEFINE(ly_extended_make_music, - "ly:make-bare-music", 2, 0, 0, (SCM type, SCM props), - "Make a music object/expression of type @var{type}, init with\n" -"@var{props}. Warning: this interface will likely change in the near\n" -"future.\n" -"\n" -"Music is the data type that music expressions are stored in. The data\n" -"type does not yet offer many manipulations.\n" -"\n" -"WARNING: only for internal use. Please use make-music-by-name. \n" -) +void +Music::send_to_context (Context *c) { - SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); - - SCM s = make_music (ly_scm2string (type))->self_scm (); - unsmob_music (s)->immutable_property_alist_ = props; - scm_gc_unprotect_object (s); - return s; + Stream_event *ev = to_event (); + c->event_source ()->broadcast (ev); + ev->unprotect (); } -// to do property args -LY_DEFINE(ly_get_mutable_properties, - "ly:get-mutable-properties", 1, 0, 0, (SCM mus), -"Return an alist signifying the mutable properties of @var{mus}.\n" -"The immutable properties are not available; they should be initialized\n" -"by the functions make-music-by-name function.\n" -) +Music * +make_music_by_name (SCM sym) { - Music *m = unsmob_music (mus); - SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM make_music_proc = ly_lily_module_constant ("make-music"); + SCM rv = scm_call_1 (make_music_proc, sym); - return m->get_property_alist (true); + /* UGH. */ + Music *m = unsmob_music (rv); + m->protect (); + return m; } -LY_DEFINE(ly_music_list_p,"music-list?", 1, 0, 0, - (SCM l),"Type predicate: return true if @var{l} is a list of music objects.") +MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1); +SCM +Music::duration_length_callback (SCM m) { - if (scm_list_p (l) != SCM_BOOL_T) - return SCM_BOOL_F; + Music *me = unsmob_music (m); + Duration *d = unsmob_duration (me->get_property ("duration")); - while (gh_pair_p (l)) - { - if (!unsmob_music (gh_car (l))) - return SCM_BOOL_F; - l =gh_cdr (l); - } - return SCM_BOOL_T; + Moment mom; + if (d) + mom = d->get_length (); + return mom.smobbed_copy (); } -ADD_MUSIC(Music); - - -SCM make_music_proc; - -Music* -make_music_by_name (SCM sym) +Music * +unsmob_music (SCM m) { - if (!make_music_proc) - make_music_proc = scm_primitive_eval (ly_symbol2scm ("make-music-by-name")); - - SCM rv = scm_call_1 (make_music_proc, sym); - - /* - UGH. - */ - scm_gc_protect_object (rv); - return unsmob_music (rv); + return dynamic_cast (unsmob_prob (m)); } +