X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=178a602aa74a1340a0a5f5a25a520e957cd3f7d9;hb=0817e0513d1016ff22a633b6fee20ddba2a062f2;hp=1c2deb27977c3901025fe378338275fb4ecee69e;hpb=8aad615ea7bb31f49a0c2afc21eea5ff5de20437;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 1c2deb2797..178a602aa7 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,57 +3,310 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2001 Han-Wen Nienhuys */ - +#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" -Music::Music() +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; } -void -Music::compress (Moment) + +Music::Music () { + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); } -void -Music::do_print() const +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 +Music::compress (Moment) +{ +} + + + 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 +{ + Moment m ; + return m; +} + void -Music::print() const -{ -#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 +print_alist (SCM a, SCM port) +{ + 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); + } } -Musical_pitch -Music::to_relative_octave (Musical_pitch m) +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 (Pitch) +{ +} + +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); +} + +#if 0 +/* + 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; +} + +SCM +Music::get_mus_property (const char *nm) const +{ + SCM sym = ly_symbol2scm (nm); + return get_mus_property (sym); +} + +void +Music::set_mus_property (const char* k, SCM v) +{ + SCM s = ly_symbol2scm (k); + set_mus_property (s, v); +} + void -Music::transpose (Musical_pitch ) +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); +} +#endif + +void +Music::internal_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 +{ + 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); + + if (sc) + { + return sc->internal_get_mus_property (sym); + } + else + { + warning (_ ("ly_get_mus_property (): Not a Music")); + scm_write (mus, scm_current_error_port ()); + } + return SCM_EOL; } + +SCM +ly_set_mus_property (SCM mus, SCM sym, SCM val) +{ + 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 ()); + + return SCM_UNSPECIFIED; + } + + if (sc) + { + sc->internal_set_mus_property (sym, val); + } + else + { + warning (_ ("ly_set_mus_property (): not of type Music")); + scm_write (mus, scm_current_error_port ()); + } + + return SCM_UNSPECIFIED; +} + + +// to do property args +SCM +ly_make_music (SCM type) +{ + if (!gh_string_p (type)) + { + warning (_ ("ly_make_music (): Not a string")); + scm_write (type, scm_current_error_port ()); + + return SCM_UNSPECIFIED; + } + else + { + 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); + 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); +} + +static void +init_functions () +{ + 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);