X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=cab1a30e29df4068b1184dafb7eb77a84fee2f61;hb=2cf1c2005c4a09e23a554b41f533453bf595c2be;hp=df98520a1ac8bb1acc8d87f014ce113473b821b8;hpb=6d37e68b8d93284b8ce8a17975fe3ac482a02f2d;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index df98520a1a..cab1a30e29 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -1,9 +1,20 @@
 /*
-  key-performer.cc -- implement Key_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2010 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 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
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "audio-item.hh"
@@ -52,7 +63,7 @@ Key_performer::process_music ()
 
       Pitch key_do (0,
 		    scm_to_int (scm_caar (pitchlist)),
-		    scm_to_int (scm_cdar (pitchlist)));
+		    ly_scm2rational (scm_cdar (pitchlist)));
 
       Pitch c_do (0, 0, 0);
 
@@ -66,8 +77,8 @@ Key_performer::process_music ()
       SCM third = scm_assoc (scm_from_int (2),
 			     c_pitchlist);
       bool minor = (scm_is_pair (third)
-		    && scm_is_integer (scm_cdr (third))
-		    && scm_to_int (scm_cdr (third)) == FLAT);
+		    && scm_is_number (scm_cdr (third))
+		    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
 
       audio_ = new Audio_key (scm_to_int (acc),
 			      !minor);
@@ -96,6 +107,15 @@ Key_performer::listen_key_change (Stream_event *ev)
 }
 
 ADD_TRANSLATOR (Key_performer,
-		"", "",
-		"key-change-event",
-		"", "");
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);