X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=68525c51a01458ea50194e42594af94a7a91a158;hb=72e907de352fb29336e9d70b9c2a999f881e79be;hp=c9955845dace681e762e5c343f7e2cbc7226d244;hpb=94375d04f45b415ad705fd444fdb344416f116d9;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index c9955845da..68525c51a0 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,107 +3,135 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "input-smob.hh" #include "music.hh" -#include "music-list.hh" -#include "debug.hh" -#include "pitch.hh" +#include "music-sequence.hh" +#include "duration.hh" +#include "input-smob.hh" #include "ly-smobs.icc" +#include "main.hh" +#include "pitch.hh" +#include "score.hh" +#include "warn.hh" -SCM -ly_deep_mus_copy (SCM m) +/* + Music is anything that has 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 ifs = get_property ("types"); + + return scm_c_memq (k, ifs) != SCM_BOOL_F; +} + +String +Music::name () const +{ + SCM nm = get_property ("name"); + if (scm_is_symbol (nm)) { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (ss); - return ss; + return ly_symbol2string (nm); } - else if (gh_pair_p (m)) + else { - return gh_cons (ly_deep_mus_copy (ly_car (m)), ly_deep_mus_copy (ly_cdr (m))); + return classname (this); } - else - return m; } - -Music::Music () +Music::Music (SCM init) { - immutable_property_alist_ = SCM_EOL; + self_scm_ = SCM_EOL; + immutable_property_alist_ = init; mutable_property_alist_ = SCM_EOL; smobify_self (); + + length_callback_ = get_property ("length-callback"); + start_callback_ = get_property ("start-callback"); } Music::Music (Music const &m) { immutable_property_alist_ = m.immutable_property_alist_; - SCM c =ly_deep_mus_copy (m.mutable_property_alist_); - mutable_property_alist_ = c; + 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 ()); } - -Music::Music (SCM l) +Music::~Music () { - immutable_property_alist_ = l; - mutable_property_alist_ = SCM_EOL; - smobify_self (); } +ADD_MUSIC (Music); + +SCM +Music::get_property_alist (bool m) const +{ + return (m) ? mutable_property_alist_ : immutable_property_alist_; +} SCM Music::mark_smob (SCM m) { - Music * mus = (Music *)SCM_CELL_WORD_1 (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; } -void -Music::compress (Moment) -{ -} - - - 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_c_procedure_p (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 = get_property ("start-callback"); + if (ly_c_procedure_p (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); } } @@ -112,205 +140,178 @@ 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); + SCM nm = m->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::to_relative_octave (Pitch m) +Music::generic_to_relative_octave (Pitch last) { - return m; -} - - -void -Music::transpose (Pitch) -{ -} - -IMPLEMENT_TYPE_P (Music, "music?"); -IMPLEMENT_UNSMOB (Music,music); -IMPLEMENT_SMOBS (Music); -IMPLEMENT_DEFAULT_EQUAL_P (Music); + 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); -SCM -Music::get_mus_property (const char *nm) const -{ - SCM sym = ly_symbol2scm (nm); - return get_mus_property (sym); + last = music_list_to_relative (get_property ("elements"), last, false); + return last; } -SCM -Music::get_mus_property (SCM sym) const +Pitch +Music::to_relative_octave (Pitch last) { - 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); -} + SCM callback = get_property ("to-relative-callback"); + if (ly_c_procedure_p (callback)) + { + Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ())); + return *p; + } -/* - 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) -{ - SCM val = get_mus_property (key); - if (val != SCM_EOL) - set_mus_property (key, SCM_EOL); - return val; + 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 (const char*k, SCM v) -{ - SCM s = ly_symbol2scm (k); - set_immutable_mus_property (s, v); -} + if (Music *m = unsmob_music (elt)) + m->compress (factor); -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); + 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 ()); } -void -Music::set_mus_property (SCM s, SCM v) -{ - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); -} - -#include "main.hh" void -Music::set_spot (Input ip) -{ - set_mus_property ("origin", make_input (ip)); -} - - - -Input* -Music::origin () const +Music::transpose (Pitch delta) { - Input *ip = unsmob_input (get_mus_property ("origin")); - return ip ? ip : & dummy_input_global; -} + if (to_boolean (get_property ("untransposable"))) + return; + 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); -Music::~Music () -{ - -} - -SCM -ly_get_mus_property (SCM mus, SCM sym) -{ - Music * sc = unsmob_music (mus); - - if (sc) - { - return sc->get_mus_property (sym); - } - else + /* + UGH - how do this more generically? + */ + SCM pa = get_property ("pitch-alist"); + if (scm_is_pair (pa)) { - warning (_ ("ly_get_mus_property (): Not a Music")); - scm_write (mus, scm_current_error_port ()); + set_property ("pitch-alist", ly_transpose_key_alist (pa, delta.smobbed_copy ())); } - return SCM_EOL; } +IMPLEMENT_TYPE_P (Music, "ly:music?"); +IMPLEMENT_SMOBS (Music); +IMPLEMENT_DEFAULT_EQUAL_P (Music); SCM -ly_set_mus_property (SCM mus, SCM sym, SCM val) +Music::internal_get_property (SCM sym) const { - 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 ()); + SCM s = scm_sloppy_assq (sym, mutable_property_alist_); + if (s != SCM_BOOL_F) + return scm_cdr (s); - return SCM_UNSPECIFIED; - } + s = scm_sloppy_assq (sym, immutable_property_alist_); + return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); +} - 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 ()); - } +void +Music::internal_set_property (SCM s, SCM v) +{ + if (do_internal_type_checking_global) + if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) + abort (); - return SCM_UNSPECIFIED; + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } - -// to do property args -SCM -ly_make_music (SCM type) +void +Music::set_spot (Input ip) { - if (!gh_string_p (type)) - { - warning (_ ("ly_make_music (): Not a string")); - scm_write (type, scm_current_error_port ()); + set_property ("origin", make_input (ip)); +} - return SCM_UNSPECIFIED; - } - else - { - SCM s = get_music (ly_scm2string (type))->self_scm (); - scm_gc_unprotect_object (s); - return s; - } +Input * +Music::origin () const +{ + Input *ip = unsmob_input (get_property ("origin")); + return ip ? ip : &dummy_input_global; } -SCM -ly_music_name (SCM mus) +int +Music::duration_log () const { - 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); + if (is_mus_type ("rhythmic-event")) + return unsmob_duration (get_property ("duration"))->duration_log (); + return 0; } -static void -init_functions () +Music * +make_music_by_name (SCM sym) { - 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); + SCM make_music_proc = ly_lily_module_constant ("make-music"); + SCM rv = scm_call_1 (make_music_proc, sym); + + /* UGH. */ + scm_gc_protect_object (rv); + return unsmob_music (rv); } -ADD_SCM_INIT_FUNC (musicscm,init_functions); -ADD_MUSIC(Music);