X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=5d7e57754bcc4cd4f22a4026bbab6abec290b739;hb=2210b90dc27efb3abd756dfccd9048785130ad4a;hp=8d7ce5cb881c3d4acbbc54613875fb0c86529329;hpb=28ec8d66e2243ad5bee7591bf8f67d661dd3f125;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 8d7ce5cb88..5d7e57754b 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,17 +3,69 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1998 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ - +#include "main.hh" +#include "input-smob.hh" #include "music.hh" #include "music-list.hh" #include "debug.hh" -#include "musical-pitch.hh" +#include "pitch.hh" +#include "ly-smobs.icc" + +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::Music() +Music::Music () { + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); +} + +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; + + smobify_self (); + + set_spot (*m.origin ()); +} + + +Music::Music (SCM l) +{ + immutable_property_alist_ = l; + mutable_property_alist_ = SCM_EOL; + smobify_self (); +} + + +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; } void @@ -21,39 +73,214 @@ Music::compress (Moment) { } -void -Music::do_print() const + + +Moment +Music::length_mom () const { + SCM l = get_mus_property ("length"); + if (unsmob_moment (l)) + return *unsmob_moment (l); + else if (gh_procedure_p (l)) + { + SCM res = gh_call1 (l, self_scm ()); + return *unsmob_moment (res); + } + + return 0; } Moment -Music::duration () const +Music::start_mom () const { - return 0; + SCM l = get_mus_property ("start-moment-function"); + if (gh_procedure_p (l)) + { + SCM res = gh_call1 (l, self_scm ()); + return *unsmob_moment (res); + } + + Moment m ; + return m; } void -Music::print() const +print_alist (SCM a, SCM port) { -#ifndef NPRINT - if (! check_debug) - return ; - DOUT << classname(this) << "{"; - if (translator_type_str_.length_i ()) - DOUT << translator_type_str_ << " = " << translator_id_str_; - do_print(); - DOUT << "}\n"; -#endif + for (SCM s = a; gh_pair_p (s); s = ly_cdr (s)) + { + scm_display (ly_caar (s), port); + scm_puts (" = ", port); + scm_write (ly_cdar (s), port); + scm_puts ("\n", port); + } +} + +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); + return 1; } -Musical_pitch -Music::to_relative_octave (Musical_pitch m) +Pitch +Music::to_relative_octave (Pitch m) { return m; } + +void +Music::transpose (Pitch delta) +{ + Pitch *p = unsmob_pitch (get_mus_property ("pitch")); + if (!p) + return ; + + Pitch np = *p; + np.transpose (delta); + + if (abs (np.alteration_i_) > 2) + { + warning (_f ("Transposition by %s makes accidental larger than two", + delta.str ())); + } + + set_mus_property ("pitch", np.smobbed_copy ()); +} + +IMPLEMENT_TYPE_P (Music, "music?"); + +IMPLEMENT_SMOBS (Music); +IMPLEMENT_DEFAULT_EQUAL_P (Music); + +/****************************/ + +SCM +Music::internal_get_mus_property (SCM sym) const +{ + 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); +} + +void +Music::internal_set_mus_property (SCM s, SCM v) +{ +#ifndef NDEBUG + if (internal_type_checking_global_b) + assert (type_check_assignment (s, v, ly_symbol2scm ("music-type?"))); +#endif + + mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v); +} + +#include "main.hh" + void -Music::transpose (Musical_pitch ) +Music::set_spot (Input ip) +{ + set_mus_property ("origin", make_input (ip)); +} + +Input* +Music::origin () const +{ + Input *ip = unsmob_input (get_mus_property ("origin")); + return ip ? ip : & dummy_input_global; +} + + +Music::~Music () +{ + +} + +SCM +ly_get_mus_property (SCM mus, SCM sym) { + Music * sc = unsmob_music (mus); + SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + + return sc->internal_get_mus_property (sym); + } + +SCM +ly_set_mus_property (SCM mus, SCM sym, SCM val) +{ + Music * sc = unsmob_music (mus); + SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "grob"); + SCM_ASSERT_TYPE(gh_symbol_p(sym), sym, SCM_ARG2, __FUNCTION__, "symbol"); + + bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?")); + if (ok) + { + sc->internal_set_mus_property (sym, val); + } + + return SCM_UNSPECIFIED; +} + + +// to do property args +SCM +ly_make_music (SCM type) +{ + SCM_ASSERT_TYPE(gh_string_p(type), type, SCM_ARG1, __FUNCTION__, "string"); + + + SCM s = get_music (ly_scm2string (type))->self_scm (); + scm_gc_unprotect_object (s); + + return s; +} + +SCM +ly_music_name (SCM mus) +{ + Music * m = unsmob_music (mus); + SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + const char * nm = classname (m); + return ly_str02scm (nm); +} + +SCM +ly_music_list_p (SCM l) +{ + if (scm_list_p (l) != SCM_BOOL_T) + return SCM_BOOL_F; + + while (gh_pair_p (l)) + { + if (!unsmob_music (gh_car (l))) + return SCM_BOOL_F; + l =gh_cdr (l); + } + return SCM_BOOL_T; +} + +static void +init_functions () +{ + scm_c_define_gsubr ("music-list?", 1, 0, 0, (Scheme_function_unknown)ly_music_list_p); + 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); +} +ADD_SCM_INIT_FUNC (musicscm,init_functions); +ADD_MUSIC(Music);