X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic.cc;h=ae75ff795273da024d404a76d144f10da52613bd;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=bbf7fe4f585da5c8ed909088627346767bb1971d;hpb=2606faf48590c90bd488a8944c7612acef11ed8c;p=lilypond.git diff --git a/lily/music.cc b/lily/music.cc index bbf7fe4f58..ae75ff7952 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -45,12 +45,15 @@ Music::internal_is_music_type (SCM k) const return scm_is_true (scm_c_memq (k, ifs)); } -Music::Music (SCM init) - : Prob (ly_symbol2scm ("Music"), init) +Preinit_Music::Preinit_Music () { length_callback_ = SCM_EOL; start_callback_ = SCM_EOL; +} +Music::Music (SCM init) + : Prob (ly_symbol2scm ("Music"), init) +{ length_callback_ = get_property ("length-callback"); if (!ly_is_procedure (length_callback_)) length_callback_ = duration_length_callback_proc; @@ -234,7 +237,7 @@ Prob::transpose (Pitch delta) && scm_is_pair (val)) new_val = ly_transpose_key_alist (val, delta.smobbed_copy ()); - if (val != new_val) + if (!scm_is_eq (val, new_val)) scm_set_cdr_x (entry, new_val); } }