(triangle): add s to 0triangle.

[lilypond.git] / lily / key-performer.cc

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index f27f0d85f4c3614c9f4b4c51fa488ccf3bb12b54..8d00b911cd026e0f93c6ef56df4d0ce0b63be789 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -6,13 +6,10 @@
   (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.hh"
-
 #include "audio-item.hh"
 #include "performer.hh"
 #include "warn.hh"
 
-
 class Key_performer : public Performer
 {
 public:
@@ -50,14 +47,14 @@ Key_performer::create_audio_elements ()
       SCM acc = scm_call_1 (proc, pitchlist);
       
       Pitch key_do (0, 
-                   scm_to_int (ly_caar (pitchlist)),
-                   scm_to_int (ly_cdar (pitchlist)));
+                   scm_to_int (scm_caar (pitchlist)),
+                   scm_to_int (scm_cdar (pitchlist)));
 
       Pitch c_do (0, 0, 0);
                  
       SCM c_pitchlist
        = ly_transpose_key_alist (pitchlist,
-                                 interval (key_do, c_do).smobbed_copy ());
+                                 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.  */
@@ -96,7 +93,7 @@ Key_performer::try_music (Music* req)
   return false;
 }
 
-ENTER_DESCRIPTION (Key_performer,
+ADD_TRANSLATOR (Key_performer,
                  "","",
                  "key-change-event",
                  "","","");