X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=06666ac53257083095af1323b62df7ec531d0dfa;hb=331e0656b3ba91200c50c672741977b65a5842af;hp=cab1a30e29df4068b1184dafb7eb77a84fee2f61;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index cab1a30e29..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--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   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,31 +58,30 @@ 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)));
+                    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,
-				  pitch_interval (key_do, c_do).smobbed_copy ());
+        = ly_transpose_key_alist (pitchlist,
+                                  pitch_interval (key_do, c_do).smobbed_copy ());
 
       /* MIDI keys are too limited for lilypond scales.
-	 We check for minor scale and assume major otherwise.  */
+         We check for minor scale and assume major otherwise.  */
 
       SCM third = scm_assoc (scm_from_int (2),
-			     c_pitchlist);
+                             c_pitchlist);
       bool minor = (scm_is_pair (third)
-		    && scm_is_number (scm_cdr (third))
-		    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
+                    && scm_is_number (scm_cdr (third))
+                    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
 
       audio_ = new Audio_key (scm_to_int (acc),
-			      !minor);
+                              !minor);
 
       Audio_element_info info (audio_, key_ev_);
       announce_element (info);
@@ -107,15 +107,15 @@ Key_performer::listen_key_change (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Key_performer,
-		/* doc */
-		"",
+                /* doc */
+                "",
 
-		/* create */
-		"",
+                /* create */
+                "",
 
-		/* read */
-		"",
+                /* read */
+                "",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );