X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=313f2c56f3d8576f62654c94f39653ca9c304088;hb=aac814e0904dde5c2d5bba5f165e61826c72b1aa;hp=7de77d1fc9551ee6d5eed197aa5165054593cc4c;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 7de77d1fc9..313f2c56f3 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,60 +3,293 @@ source file of the GNU LilyPond music typesetter - (c) 1997 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 "warn.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 () +{ + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); +} + +Music::Music (Music const &m) +{ + immutable_property_alist_ = m.immutable_property_alist_; + mutable_property_alist_ = 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 ()); +} + + +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; +} -MInterval -Music::time_int() const +void +Music::compress (Moment) { - return MInterval (0,0); +} + + + +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::start_mom () const +{ + 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 -{ -#ifndef NPRINT - if (! check_debug) - return ; - DOUT << name() << "{"; - if (type_str_!="" || id_str_!="") - DOUT << "`" < catch malformed lists. + */ + for (SCM s = a; s != SCM_EOL; 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; +} + +Pitch +Music::to_relative_octave (Pitch m) +{ + return m; } + void -Music::transpose (Melodic_req const*) +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_) > 2) + { + warning (_f ("Transposition by %s makes accidental larger than two", + delta.string ())); + } + + 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::translate (Moment) +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::do_print() const +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; +} -IMPLEMENT_IS_TYPE_B(Music); +Music::~Music () +{ + +} + +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}.") +{ + 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"); + + return sc->internal_get_mus_property (sym); +} + +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__, "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 +LY_DEFINE(ly_make_music, + "ly-make-music", 1, 0, 0, (SCM type), + " +Make a music object/expression of type @var{name}. Warning: this +interface will likely change in the near future. + +Music is the data type that music expressions are stored in. The data +type does not yet offer many manipulations. +") +{ + SCM_ASSERT_TYPE(gh_string_p (type), type, SCM_ARG1, __FUNCTION__, "string"); -Music::Music() + SCM s = make_music (ly_scm2string (type))->self_scm (); + scm_gc_unprotect_object (s); + + return s; +} + +LY_DEFINE(ly_music_name, "ly-music-name", 1, 0, 0, + (SCM mus), + "Return the name of @var{music}.") { - parent_music_l_ =0; + Music * m = unsmob_music (mus); + SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music"); + + const char * nm = classname (m); + return scm_makfrom0str (nm); } -IMPLEMENT_IS_TYPE_B1(Change_reg,Music) +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.") +{ + 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; +} +ADD_MUSIC(Music);