X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=f77c1dfce3def90c8ec679117a92f0320bbf7579;hb=810defa88e1c382cf3bb1715a77b883d0b1c85a0;hp=e67c68f27dd5170040700c090183e022538786be;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index e67c68f27d..f77c1dfce3 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,35 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.hh"
-
+#include "music-sequence.hh"
 #include "audio-item.hh"
 #include "performer.hh"
 #include "warn.hh"
 
-
 class Key_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Key_performer);
+  TRANSLATOR_DECLARATIONS (Key_performer);
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req);
+  virtual bool try_music (Music* ev);
   virtual void create_audio_elements ();
   virtual void stop_translation_timestep ();
 
 private:
-  Key_change_req* key_req_;
+  Event* key_ev_;
   Audio_key* audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -42,35 +40,32 @@ Key_performer::~Key_performer ()
 void
 Key_performer::create_audio_elements ()
 {
-  if (key_req_) 
+  if (key_ev_) 
     {
-
-      /*
-	UGH. primitive-eval.
-       */
-      SCM pitchlist = key_req_->get_mus_property ("pitch-alist");
-      SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); 
-      SCM acc = gh_call1 (proc, pitchlist);
-      proc = scm_primitive_eval (ly_symbol2scm ("major-key"));
- 
-      Pitch my_do (0, 
-		   gh_scm2int (ly_caar (pitchlist)),
-		   gh_scm2int (ly_cdar (pitchlist)));
+      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, 
+		    scm_to_int (scm_caar (pitchlist)),
+		    scm_to_int (scm_cdar (pitchlist)));
+
+      Pitch c_do (0, 0, 0);
 		  
-      Pitch to_c (-1,
-		   (7 - gh_scm2int (ly_caar (pitchlist))) % 7,
-		   -gh_scm2int (ly_cdar (pitchlist)));
-
-      my_do.transpose (to_c);
-      to_c.alteration_ -= my_do.alteration_;
+      SCM c_pitchlist
+	= ly_transpose_key_alist (pitchlist,
+				  pitch_interval (key_do, c_do).smobbed_copy ());
 
-      SCM c_pitchlist = transpose_key_alist (pitchlist, to_c.smobbed_copy());
-      SCM major = gh_call1 (proc, c_pitchlist);
+      /* MIDI keys are too limited for lilypond scales.
+	 We check for minor scale and assume major otherwise.  */
+      SCM minor = scm_c_eval_string ("minor");
+      audio_ = new Audio_key (scm_to_int (acc),
+			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
 
-      audio_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
-      Audio_element_info info (audio_, key_req_);
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -85,21 +80,21 @@ Key_performer::stop_translation_timestep ()
 }
 
 bool
-Key_performer::try_music (Music* req)
+Key_performer::try_music (Music* ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
+  if (Event *kc = dynamic_cast <Event *> (ev))
     {
-      if (key_req_)
+      if (key_ev_)
 	warning (_ ("FIXME: key change merge"));
 
-      key_req_ = kc;
+      key_ev_ = kc;
       return true;
     }
 
   return false;
 }
 
-ENTER_DESCRIPTION(Key_performer,
+ADD_TRANSLATOR (Key_performer,
 		  "","",
 		  "key-change-event",
 		  "","","");