X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=4d882ba98339d42d9b2237309a6bbbb94bd11f4c;hb=712b6f387c98454e0fc8c5b6c7f0848acf4b29ec;hp=bcc942e095ac9625a18a27b1c285ed06c03ba707;hpb=f12ef1c68506b5d8a9ae4d8b5d894109ce8fe17a;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index bcc942e095..4d882ba983 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -6,29 +6,29 @@ (c) 1997--2004 Han-Wen Nienhuys */ -#include "main.hh" #include "input-smob.hh" -#include "music.hh" +#include "ly-smobs.icc" +#include "main.hh" #include "music-list.hh" -#include "warn.hh" +#include "music.hh" #include "pitch.hh" -#include "ly-smobs.icc" - +#include "score.hh" +#include "warn.hh" bool -Music::internal_is_music_type (SCM k)const +Music::internal_is_music_type (SCM k) const { 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 { SCM nm = get_property ("name"); - if (gh_symbol_p (nm)) + if (ly_c_symbol_p (nm)) { return ly_symbol2string (nm); } @@ -38,7 +38,13 @@ Music::name () const } } - +Music::Music () +{ + self_scm_ = SCM_EOL; + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); +} Music::Music (Music const &m) { @@ -46,24 +52,20 @@ Music::Music (Music const &m) 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. - */ + /* 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 ()); } -Music::Music () +Music::~Music () { - self_scm_ = SCM_EOL; - immutable_property_alist_ = SCM_EOL; - mutable_property_alist_ = SCM_EOL; - smobify_self (); } +ADD_MUSIC (Music); + SCM Music::get_property_alist (bool m) const { @@ -73,7 +75,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; @@ -82,42 +84,40 @@ Music::mark_smob (SCM m) Moment Music::get_length () const { - SCM l = get_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); + else if (ly_c_procedure_p (lst)) { - SCM res = gh_call1 (l, self_scm ()); + SCM res = scm_call_1 (lst, self_scm ()); return *unsmob_moment (res); } - + return 0; } Moment Music::start_mom () const { - SCM l = get_property ("start-moment-function"); - if (gh_procedure_p (l)) + SCM lst = get_property ("start-moment-function"); + if (ly_c_procedure_p (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; ly_c_pair_p (s); s = ly_cdr (s)) { scm_display (ly_caar (s), port); - scm_puts (" = ", port); + scm_puts (" = ", port); scm_write (ly_cdar (s), port); scm_puts ("\n", port); } @@ -130,20 +130,14 @@ Music::print_smob (SCM s, SCM p, scm_print_state*) Music* m = unsmob_music (s); SCM nm = m->get_property ("name"); - if (gh_symbol_p (nm) || gh_string_p (nm)) - { - scm_display (nm, p); - } + if (ly_c_symbol_p (nm) || ly_c_string_p (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 (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; @@ -154,11 +148,10 @@ Music::to_relative_octave (Pitch p) { SCM elt = get_property ("element"); - if (Music* m = unsmob_music (elt)) + if (Music *m = unsmob_music (elt)) p = m->to_relative_octave (p); - p = music_list_to_relative (get_property ("elements"), - p, false); + p = music_list_to_relative (get_property ("elements"), p, false); return p; } @@ -167,13 +160,12 @@ Music::compress (Moment factor) { SCM elt = get_property ("element"); - if (Music* m = unsmob_music (elt)) + if (Music *m = unsmob_music (elt)) m->compress (factor); compress_music_list (get_property ("elements"), factor); } - void Music::transpose (Pitch delta) { @@ -185,14 +177,10 @@ Music::transpose (Pitch delta) transpose_music_list (get_property ("elements"), delta); } - IMPLEMENT_TYPE_P (Music, "ly:music?"); - IMPLEMENT_SMOBS (Music); IMPLEMENT_DEFAULT_EQUAL_P (Music); -/****************************/ - SCM Music::internal_get_property (SCM sym) const { @@ -201,7 +189,7 @@ Music::internal_get_property (SCM sym) const return ly_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 : ly_cdr (s); } void @@ -214,8 +202,6 @@ Music::internal_set_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) { @@ -226,167 +212,181 @@ Input* Music::origin () const { Input *ip = unsmob_input (get_property ("origin")); - return ip ? ip : & dummy_input_global; + return ip ? ip : & dummy_input_global; } -Music::~Music () +Music* +make_music_by_name (SCM sym) { - + SCM make_music_proc = ly_scheme_function ("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 (in musical time) of music expression @var{mus}.") +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(); + 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), +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" ) + "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(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (ly_c_symbol_p (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), +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(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + SCM_ASSERT_TYPE (sc, mus, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (ly_c_symbol_p (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}.") +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); + Music *m = unsmob_music (mus); + SCM_ASSERT_TYPE (m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + char const *nm = classname (m); return scm_makfrom0str (nm); } - - -// to do property args -LY_DEFINE(ly_extended_make_music, - "ly:make-bare-music", 2, 0, 0, (SCM type, SCM props), +/* 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-by-name}, which is the preferred interface " + "@code{make-music}, which is the preferred interface " "for creating music objects. " ) { - SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); - + SCM_ASSERT_TYPE (ly_c_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; } -// to do property args -LY_DEFINE(ly_get_mutable_properties, - "ly:get-mutable-properties", 1, 0, 0, (SCM mus), +/* 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; they should be initialized\n" - "by the @code{make-music-by-name} function.\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"); - + 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 l),"Type predicate: return true if @var{l} is a list of music objects.") +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 (l) != SCM_BOOL_T) - return SCM_BOOL_F; + if (scm_list_p (lst) == SCM_BOOL_T) + while (ly_c_pair_p (lst)) + { + if (!unsmob_music (ly_car (lst))) + return SCM_BOOL_F; + lst = ly_cdr (lst); + } - while (gh_pair_p (l)) - { - if (!unsmob_music (gh_car (l))) - return SCM_BOOL_F; - l =gh_cdr (l); - } return SCM_BOOL_T; } -ADD_MUSIC(Music); - - -LY_DEFINE(ly_deep_mus_copy, - "ly:music-deep-copy", 1,0,0, (SCM m), +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)) { - SCM ss = unsmob_music (m)->clone ()->self_scm (); - scm_gc_unprotect_object (ss); - return ss; + copy = unsmob_music (m)->clone ()->self_scm (); + scm_gc_unprotect_object (copy); } - 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; + else if (ly_c_pair_p (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), +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}.") + "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"); + SCM_ASSERT_TYPE (sc, m, SCM_ARG1, __FUNCTION__, "music"); + SCM_ASSERT_TYPE (sp, p, SCM_ARG2, __FUNCTION__, "pitch"); sc->transpose (*sp); - return sc->self_scm(); // SCM_UNDEFINED ? + // SCM_UNDEFINED ? + return sc->self_scm (); } - -SCM make_music_proc; - - -Music* -make_music_by_name (SCM sym) +/* + 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}." + ) { - 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); + Music * sc = unsmob_music (m); - /* - UGH. - */ - scm_gc_protect_object (rv); - return unsmob_music (rv); + 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", + 1, 0, 0, + (SCM music), + "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; + + /* URG? */ + SCM check_funcs = ly_scheme_function ("toplevel-music-functions"); + for (; ly_c_pair_p (check_funcs); check_funcs = ly_cdr (check_funcs)) + music = scm_call_1 (ly_car (check_funcs), music); + + score->music_ = music; + scm_gc_unprotect_object (score->self_scm ()); + return score->self_scm (); +}