X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=81f4a3d67f18e43b0ffb6038c38ea6c5a3556e33;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=d5170adc9c2eb42a2899fc7fcd48b046acfb6106;hpb=6ef88209edc32d198656693a94cd07a65ce0e579;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index d5170adc9c..81f4a3d67f 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2010 Han-Wen Nienhuys + Copyright (C) 1997--2015 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 @@ -24,7 +24,6 @@ #include "duration.hh" #include "input.hh" #include "international.hh" -#include "ly-smobs.icc" #include "main.hh" #include "music-sequence.hh" #include "score.hh" @@ -83,7 +82,7 @@ Music::Music (Music const &m) length_callback_ = m.length_callback_; start_callback_ = m.start_callback_; - /// why? + /// why? set_spot (*m.origin ()); } @@ -91,13 +90,13 @@ Moment Music::get_length () const { SCM lst = get_property ("length"); - if (unsmob_moment (lst)) - return *unsmob_moment (lst); + if (Moment::is_smob (lst)) + return *Moment::unsmob (lst); if (ly_is_procedure (length_callback_)) { SCM res = scm_call_1 (length_callback_, self_scm ()); - return *unsmob_moment (res); + return *Moment::unsmob (res); } return Moment (0); @@ -110,7 +109,7 @@ Music::start_mom () const if (ly_is_procedure (lst)) { SCM res = scm_call_1 (lst, self_scm ()); - return *unsmob_moment (res); + return *Moment::unsmob (res); } Moment m; @@ -130,12 +129,11 @@ print_alist (SCM a, SCM port) } } - Pitch Music::generic_to_relative_octave (Pitch last) { SCM elt = get_property ("element"); - Pitch *old_pit = unsmob_pitch (get_property ("pitch")); + Pitch *old_pit = Pitch::unsmob (get_property ("pitch")); if (old_pit) { Pitch new_pit = *old_pit; @@ -143,25 +141,26 @@ Music::generic_to_relative_octave (Pitch last) SCM check = get_property ("absolute-octave"); if (scm_is_number (check) - && new_pit.get_octave () != scm_to_int (check)) - { - 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\"", - expected_pit.to_string (), - new_pit.to_string ())); - new_pit = expected_pit; - } + && new_pit.get_octave () != scm_to_int (check)) + { + 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\"", + expected_pit.to_string (), + new_pit.to_string ())); + new_pit = expected_pit; + } set_property ("pitch", new_pit.smobbed_copy ()); last = new_pit; } - if (Music *m = unsmob_music (elt)) + if (Music *m = Music::unsmob (elt)) last = m->to_relative_octave (last); + (void) music_list_to_relative (get_property ("articulations"), last, true); last = music_list_to_relative (get_property ("elements"), last, false); return last; } @@ -172,8 +171,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 = Pitch::unsmob (scm_call_2 (callback, self_scm (), + last.smobbed_copy ())); return *p; } @@ -185,18 +184,18 @@ Music::compress (Moment factor) { SCM elt = get_property ("element"); - if (Music *m = unsmob_music (elt)) + if (Music *m = Music::unsmob (elt)) m->compress (factor); compress_music_list (get_property ("elements"), factor); - Duration *d = unsmob_duration (get_property ("duration")); + Duration *d = Duration::unsmob (get_property ("duration")); if (d) set_property ("duration", - d->compressed (factor.main_part_).smobbed_copy ()); + d->compressed (factor.main_part_).smobbed_copy ()); } /* - This mutates alist. Hence, make sure that it is not shared + This mutates alist. Hence, make sure that it is not shared */ void transpose_mutable (SCM alist, Pitch delta) @@ -208,39 +207,30 @@ transpose_mutable (SCM alist, Pitch delta) SCM val = scm_cdr (entry); SCM new_val = val; - if (Pitch *p = unsmob_pitch (val)) - { - Pitch transposed = p->transposed (delta); - if (transposed.get_alteration ().abs () > Rational (1,1)) - { - 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 (); - } + if (Pitch *p = Pitch::unsmob (val)) + { + Pitch transposed = p->transposed (delta); + + if (prop == ly_symbol2scm ("tonic")) + transposed = Pitch (-1, transposed.get_notename (), + transposed.get_alteration ()); + + 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 (Music *m = Music::unsmob (val)) + m->transpose (delta); + } + else if (prop == ly_symbol2scm ("elements") + || prop == ly_symbol2scm ("articulations")) + 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_set_cdr_x (entry, new_val); } } @@ -256,13 +246,13 @@ Music::transpose (Pitch delta) void Music::set_spot (Input ip) { - set_property ("origin", make_input (ip)); + set_property ("origin", ip.smobbed_copy ()); } Input * Music::origin () const { - Input *ip = unsmob_input (get_property ("origin")); + Input *ip = Input::unsmob (get_property ("origin")); return ip ? ip : &dummy_input_global; } @@ -278,7 +268,9 @@ Music::to_event () const if (!internal_is_music_type (class_name)) programming_error ("Not a music type"); - Stream_event *e = new Stream_event (class_name, mutable_property_alist_); + Stream_event *e = new Stream_event + (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), class_name), + mutable_property_alist_); Moment length = get_length (); if (length.to_bool ()) e->set_property ("length", length.smobbed_copy ()); @@ -289,11 +281,10 @@ Music::to_event () const { 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); - } + { + Music *m = Music::unsmob (scm_car (art_mus)); + art_ev = scm_cons (m->to_event ()->unprotect (), art_ev); + } e->set_property ("articulations", scm_reverse_x (art_ev, SCM_EOL)); } @@ -321,7 +312,7 @@ make_music_by_name (SCM sym) SCM rv = scm_call_1 (make_music_proc, sym); /* UGH. */ - Music *m = unsmob_music (rv); + Music *m = Music::unsmob (rv); m->protect (); return m; } @@ -330,17 +321,11 @@ MAKE_SCHEME_CALLBACK (Music, duration_length_callback, 1); SCM Music::duration_length_callback (SCM m) { - Music *me = unsmob_music (m); - Duration *d = unsmob_duration (me->get_property ("duration")); + Music *me = Music::unsmob (m); + Duration *d = Duration::unsmob (me->get_property ("duration")); Moment mom; if (d) mom = d->get_length (); return mom.smobbed_copy (); } - -Music * -unsmob_music (SCM m) -{ - return dynamic_cast (unsmob_prob (m)); -}