X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=06666ac53257083095af1323b62df7ec531d0dfa;hb=d59856c2469b4b1e7f18a4ec9c5c0da4107f9de3;hp=dc247440fbacc7e1b042871dda0fc5e263b6d3ed;hpb=bb8a0a5387af94dd2702877256334b160575a730;p=lilypond.git diff --git a/lily/key-performer.cc b/lily/key-performer.cc index dc247440fb..06666ac532 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1997--2011 Jan Nieuwenhuizen + Copyright (C) 1997--2015 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "performer.hh" #include "stream-event.hh" #include "warn.hh" +#include "lily-imports.hh" #include "translator.icc" @@ -57,15 +58,14 @@ Key_performer::process_music () if (key_ev_) { SCM pitchlist = key_ev_->get_property ("pitch-alist"); - SCM proc = ly_lily_module_constant ("alterations-in-key"); - SCM acc = scm_call_1 (proc, pitchlist); + SCM acc = Lily::alterations_in_key (pitchlist); Pitch key_do (0, scm_to_int (scm_caar (pitchlist)), ly_scm2rational (scm_cdar (pitchlist))); - Pitch c_do (0, 0, 0); + Pitch c_do; SCM c_pitchlist = ly_transpose_key_alist (pitchlist,