X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=26dbe93a8dec76763045dbb5d5b6c7d5f622e2bd;hb=2a876a1f0625e31291b3c6b2d5a65f5b1aec7dde;hp=887c68488d3472d1455a7e057205caf97d8ac57f;hpb=e24df7c27635dc996c466295eacf2981bddccaf7;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 887c68488d..26dbe93a8d 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "music-sequence.hh"
@@ -18,13 +18,13 @@ public:
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* ev);
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  virtual bool try_music (Music *ev);
+  void process_music ();
+  void stop_translation_timestep ();
 
 private:
-  Event* key_ev_;
-  Audio_key* audio_;
+  Music *key_ev_;
+  Audio_key *audio_;
 };
 
 Key_performer::Key_performer ()
@@ -38,30 +38,36 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_ev_) 
+  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);
-      
-      Pitch key_do (0, 
+
+      Pitch key_do (0,
 		    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,
 				  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.  */
-      SCM minor = scm_c_eval_string ("minor");
+
+      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);
+
       audio_ = new Audio_key (scm_to_int (acc),
-			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+			      !minor);
 
       Audio_element_info info (audio_, key_ev_);
       announce_element (info);
@@ -80,21 +86,17 @@ Key_performer::stop_translation_timestep ()
 }
 
 bool
-Key_performer::try_music (Music* ev)
+Key_performer::try_music (Music *ev)
 {
-  if (Event *kc = dynamic_cast <Event *> (ev))
-    {
-      if (key_ev_)
-	warning (_ ("FIXME: key change merge"));
-
-      key_ev_ = kc;
-      return true;
-    }
+  if (!key_ev_)
+    key_ev_ = ev;
 
-  return false;
+  return true;
 }
 
+#include "translator.icc"
+
 ADD_TRANSLATOR (Key_performer,
-		  "","",
-		  "key-change-event",
-		  "","","");
+		"", "",
+		"key-change-event",
+		"", "");