X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=68525c51a01458ea50194e42594af94a7a91a158;hb=4516c9ff0c6b1cfc9b0245486a37a90cf487318e;hp=869bbbe3fd7e69618686f2c98f3fc0a9e317a76a;hpb=0886f6a00f3bfba9f42106119662d77e600e5c1b;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 869bbbe3fd..68525c51a0 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,19 +3,26 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2004 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ +#include "music.hh" +#include "music-sequence.hh" #include "duration.hh" #include "input-smob.hh" #include "ly-smobs.icc" #include "main.hh" -#include "music-list.hh" -#include "music.hh" #include "pitch.hh" #include "score.hh" #include "warn.hh" +/* + 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 { @@ -38,12 +45,15 @@ Music::name () const } } -Music::Music () +Music::Music (SCM init) { self_scm_ = SCM_EOL; - immutable_property_alist_ = 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) @@ -56,7 +66,9 @@ Music::Music (Music const &m) 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_); + 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 ()); } @@ -75,7 +87,7 @@ Music::get_property_alist (bool m) const 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; @@ -87,19 +99,20 @@ Music::get_length () const SCM lst = get_property ("length"); if (unsmob_moment (lst)) return *unsmob_moment (lst); - else if (ly_c_procedure_p (lst)) + + if (ly_c_procedure_p (length_callback_)) { - SCM res = scm_call_1 (lst, 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 lst = get_property ("start-moment-function"); + SCM lst = get_property ("start-callback"); if (ly_c_procedure_p (lst)) { SCM res = scm_call_1 (lst, self_scm ()); @@ -114,11 +127,11 @@ void print_alist (SCM a, SCM port) { /* SCM_EOL -> catch malformed lists. */ - for (SCM s = a; scm_is_pair (s); s = ly_cdr (s)) + for (SCM s = a; scm_is_pair (s); s = scm_cdr (s)) { - scm_display (ly_caar (s), port); + scm_display (scm_caar (s), port); scm_puts (" = ", port); - scm_write (ly_cdar (s), port); + scm_write (scm_cdar (s), port); scm_puts ("\n", port); } } @@ -127,32 +140,68 @@ 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); + 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); + scm_puts (">", p); return 1; } Pitch -Music::to_relative_octave (Pitch p) +Music::generic_to_relative_octave (Pitch last) { 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)) - p = m->to_relative_octave (p); + last = m->to_relative_octave (last); - p = music_list_to_relative (get_property ("elements"), p, false); - return p; + last = music_list_to_relative (get_property ("elements"), last, false); + return last; +} + +Pitch +Music::to_relative_octave (Pitch last) +{ + 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; + } + + return generic_to_relative_octave (last); } void @@ -164,35 +213,50 @@ Music::compress (Moment factor) 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 ()); } void Music::transpose (Pitch delta) { - for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = ly_cdr (s)) + 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 = ly_car (s); - SCM val = ly_cdr (entry); + SCM entry = scm_car (s); + SCM val = scm_cdr (entry); - if (Pitch * p = unsmob_pitch (val)) + if (Pitch *p = unsmob_pitch (val)) { - Pitch transposed = p->transposed (delta); + 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 two", + warning (_f ("transposition by %s makes alteration larger than double", delta.to_string ())); } } } - + SCM elt = get_property ("element"); - if (Music* m = unsmob_music (elt)) + 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 ())); + } } IMPLEMENT_TYPE_P (Music, "ly:music?"); @@ -204,20 +268,20 @@ Music::internal_get_property (SCM sym) const { SCM s = scm_sloppy_assq (sym, mutable_property_alist_); if (s != SCM_BOOL_F) - return ly_cdr (s); + return scm_cdr (s); s = scm_sloppy_assq (sym, immutable_property_alist_); - return (s == SCM_BOOL_F) ? SCM_EOL : ly_cdr (s); + return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s); } void Music::internal_set_property (SCM s, SCM v) { - if (internal_type_checking_global_b) + if (do_internal_type_checking_global) if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) abort (); - mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); } void @@ -226,11 +290,11 @@ Music::set_spot (Input ip) set_property ("origin", make_input (ip)); } -Input* +Input * Music::origin () const { Input *ip = unsmob_input (get_property ("origin")); - return ip ? ip : & dummy_input_global; + return ip ? ip : &dummy_input_global; } int @@ -241,173 +305,13 @@ Music::duration_log () const return 0; } -Music* +Music * make_music_by_name (SCM sym) { - SCM make_music_proc = ly_scheme_function ("make-music"); + 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); } - -LY_DEFINE (ly_music_length, "ly:music-length", - 1, 0, 0, (SCM mus), - "Get the length of music expression @var{mus}, and return as a @code{Moment} object.") -{ - Music *sc = unsmob_music (mus); - SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); - return sc->get_length ().smobbed_copy (); -} - -LY_DEFINE (ly_music_property, - "ly:music-property", 2, 0, 0, (SCM mus, SCM sym), - "Get the property @var{sym} of music expression @var{mus}.\n" - "If @var{sym} is undefined, return @code{' ()}.\n" ) -{ - Music * sc = unsmob_music (mus); - SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - - return sc->internal_get_property (sym); -} - -LY_DEFINE (ly_music_set_property, "ly:music-set-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 (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); - - bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); - if (ok) - { - sc->internal_set_property (sym, val); - } - - return SCM_UNSPECIFIED; -} - -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"); - - char const *nm = classname (m); - return scm_makfrom0str (nm); -} - -/* todo: property args */ -LY_DEFINE (ly_extended_make_music, "ly:make-bare-music", - 2, 0, 0, (SCM type, SCM props), - "Make a C++ music object of type @var{type}, initialize with\n" - "@var{props}. \n\n" - "" - "This function is for internal use, and is only called by " - "@code{make-music}, which is the preferred interface " - "for creating music objects. " - ) -{ - SCM_ASSERT_TYPE (scm_is_string (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; -} - -/* todo: property args */ -LY_DEFINE (ly_music_mutable_properties, "ly:music-mutable-properties", - 1, 0, 0, (SCM mus), - "Return an alist containing the mutable properties of @var{mus}.\n" - "The immutable properties are not available, since " - "they are constant and initialized by the " - "@code{make-music} function.\n") -{ - Music *m = unsmob_music (mus); - SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__, "music"); - return m->get_property_alist (true); -} - -LY_DEFINE (ly_music_list_p,"ly:music-list?", - 1, 0, 0, (SCM lst), - "Type predicate: return true if @var{lst} is a list " - "of music objects.") -{ - if (scm_list_p (lst) == SCM_BOOL_T) - while (scm_is_pair (lst)) - { - if (!unsmob_music (ly_car (lst))) - return SCM_BOOL_F; - lst = ly_cdr (lst); - } - - return SCM_BOOL_T; -} - -LY_DEFINE (ly_deep_mus_copy, "ly:music-deep-copy", - 1, 0, 0, (SCM m), - "Copy @var{m} and all sub expressions of @var{m}") -{ - SCM copy = m; - if (unsmob_music (m)) - { - copy = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (copy); - } - else if (scm_is_pair (m)) - copy = scm_cons (ly_deep_mus_copy (ly_car (m)), - ly_deep_mus_copy (ly_cdr (m))); - return copy; -} - -LY_DEFINE (ly_music_transpose, "ly:music-transpose", - 2, 0, 0, (SCM m, SCM p), - "Transpose @var{m} such that central C is mapped to @var{p}. " - "Return @var{m}.") -{ - Music * sc = unsmob_music (m); - Pitch * sp = unsmob_pitch (p); - SCM_ASSERT_TYPE (sc, m, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE (sp, p, SCM_ARG2, __FUNCTION__, "pitch"); - - sc->transpose (*sp); - // SCM_UNDEFINED ? - return sc->self_scm (); -} - -/* - TODO: should take moment factor? - */ -LY_DEFINE (ly_music_compress, "ly:music-compress", - 2, 0, 0, (SCM m, SCM factor), - "Compress music object @var{m} by moment @var{factor}." - ) -{ - Music * sc = unsmob_music (m); - - SCM_ASSERT_TYPE (sc, m, SCM_ARG1, __FUNCTION__, "music"); - SCM_ASSERT_TYPE (unsmob_moment (factor), factor, SCM_ARG2, __FUNCTION__, "moment"); - - sc->compress (*unsmob_moment (factor)); - return sc->self_scm (); -} - -LY_DEFINE (ly_music_scorify, "ly:music-scorify", - 2, 0, 0, - (SCM music, SCM parser), - "Return MUSIC encapsulated in SCORE.") -{ -#if 0 - SCM_ASSERT_TYPE (ly_c_music_p (music), music, SCM_ARG1, __FUNCTION__, "music"); -#endif - Score *score = new Score; - - score->set_music (music, parser); - - scm_gc_unprotect_object (score->self_scm ()); - return score->self_scm (); -}