X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=d5170adc9c2eb42a2899fc7fcd48b046acfb6106;hb=af97c5bad52e588c6e7a9ec5554162a615be19cb;hp=56b6998820c821c2a4a2917a5090cd60aca92a44;hpb=862601226f319d2395794fe1175e7f17485b8e19;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index 56b6998820..d5170adc9c 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -1,9 +1,20 @@ /* - music.cc -- implement Music + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2010 Han-Wen Nienhuys - (c) 1997--2006 Han-Wen Nienhuys + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "music.hh" @@ -11,21 +22,20 @@ #include "context.hh" #include "dispatcher.hh" #include "duration.hh" -#include "input-smob.hh" +#include "input.hh" #include "international.hh" #include "ly-smobs.icc" #include "main.hh" #include "music-sequence.hh" -#include "pitch.hh" #include "score.hh" #include "warn.hh" /* - Music is anything that has duration and supports both time compression - and transposition. + Music is anything that has (possibly zero) 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", + (which has a duration which can be transposed) is considered "music". */ bool Music::internal_is_music_type (SCM k) const @@ -40,7 +50,7 @@ Music::Music (SCM init) { length_callback_ = SCM_EOL; start_callback_ = SCM_EOL; - + length_callback_ = get_property ("length-callback"); if (!ly_is_procedure (length_callback_)) length_callback_ = duration_length_callback_proc; @@ -64,8 +74,7 @@ Music::copy_mutable_properties () const void Music::type_check_assignment (SCM s, SCM v) const { - if (!::type_check_assignment (s, v, ly_symbol2scm ("music-type?"))) - abort (); + ::type_check_assignment (s, v, ly_symbol2scm ("music-type?")); } Music::Music (Music const &m) @@ -139,7 +148,7 @@ Music::generic_to_relative_octave (Pitch last) 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", + origin ()->warning (_f ("octave check failed; expected \"%s\", found: \"%s\"", expected_pit.to_string (), new_pit.to_string ())); new_pit = expected_pit; @@ -163,7 +172,8 @@ Music::to_relative_octave (Pitch last) SCM callback = get_property ("to-relative-callback"); if (ly_is_procedure (callback)) { - Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), last.smobbed_copy ())); + Pitch *p = unsmob_pitch (scm_call_2 (callback, self_scm (), + last.smobbed_copy ())); return *p; } @@ -181,46 +191,66 @@ Music::compress (Moment 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 ()); + set_property ("duration", + d->compressed (factor.main_part_).smobbed_copy ()); } +/* + This mutates alist. Hence, make sure that it is not shared +*/ void -Music::transpose (Pitch delta) +transpose_mutable (SCM alist, Pitch delta) { - if (to_boolean (get_property ("untransposable"))) - return; - - for (SCM s = this->get_property_alist (true); scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = alist; scm_is_pair (s); s = scm_cdr (s)) { SCM entry = scm_car (s); + SCM prop = scm_car (entry); SCM val = scm_cdr (entry); + SCM new_val = val; if (Pitch *p = unsmob_pitch (val)) { Pitch transposed = p->transposed (delta); - scm_set_cdr_x (entry, transposed.smobbed_copy ()); - - if (abs (transposed.get_alteration ()) > DOUBLE_SHARP) + if (transposed.get_alteration ().abs () > Rational (1,1)) { - warning (_f ("transposition by %s makes alteration larger than double", - delta.to_string ())); + string delta_str; + if (delta.get_alteration ().abs () > Rational (1, 1)) + delta_str = (delta.normalized ().to_string () + + " " + _ ("(normalized pitch)")); + else + delta_str = delta.to_string (); + + warning (_f ("Transposing %s by %s makes alteration larger than double", + p->to_string (), + delta_str)); + transposed = transposed.normalized (); } + + new_val = transposed.smobbed_copy (); } + else if (prop == ly_symbol2scm ("element")) + { + if (Music *m = unsmob_music (val)) + m->transpose (delta); + } + else if (prop == ly_symbol2scm ("elements")) + transpose_music_list (val, delta); + else if (prop == ly_symbol2scm ("pitch-alist") && + scm_is_pair (val)) + new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); + + if (val != new_val) + scm_set_cdr_x (entry , new_val); } +} - SCM elt = get_property ("element"); - - if (Music *m = unsmob_music (elt)) - m->transpose (delta); - - transpose_music_list (get_property ("elements"), delta); +void +Music::transpose (Pitch delta) +{ + if (to_boolean (get_property ("untransposable"))) + return; - /* - 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 ())); + transpose_mutable (mutable_property_alist_, delta); } void @@ -236,11 +266,52 @@ Music::origin () const return ip ? ip : &dummy_input_global; } +/* + ES TODO: This method should probably be reworked or junked. +*/ +Stream_event * +Music::to_event () const +{ + SCM class_name = ly_camel_case_2_lisp_identifier (get_property ("name")); + + // catch programming mistakes. + if (!internal_is_music_type (class_name)) + programming_error ("Not a music type"); + + Stream_event *e = new Stream_event (class_name, mutable_property_alist_); + Moment length = get_length (); + if (length.to_bool ()) + e->set_property ("length", length.smobbed_copy ()); + + // articulations as events. + SCM art_mus = e->get_property ("articulations"); + if (scm_is_pair (art_mus)) + { + SCM art_ev = SCM_EOL; + for (; scm_is_pair (art_mus); art_mus = scm_cdr (art_mus)) + { + Music *m = unsmob_music (scm_car (art_mus)); + SCM ev = m ? m->to_event ()->unprotect () : scm_car (art_mus); + art_ev = scm_cons (ev, art_ev); + } + e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL)); + } + + /* + ES TODO: This is a temporary fix. Stream_events should not be + aware of music. + */ + e->set_property ("music-cause", self_scm ()); + + return e; +} + void Music::send_to_context (Context *c) { - send_stream_event (c, "MusicEvent", origin (), - ly_symbol2scm("music"), self_scm (), 0); + Stream_event *ev = to_event (); + c->event_source ()->broadcast (ev); + ev->unprotect (); } Music * @@ -271,6 +342,5 @@ Music::duration_length_callback (SCM m) Music * unsmob_music (SCM m) { - return dynamic_cast (unsmob_prob (m)); + return dynamic_cast (unsmob_prob (m)); } -