X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=8d00b911cd026e0f93c6ef56df4d0ce0b63be789;hb=f0968255554403de5d86b7e6efff5e644cba7f7a;hp=81fa1c5296eced08330422c4dab90e04665a09d7;hpb=af343e2537468645e4fe97be4c560716be88a354;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 81fa1c5296..8d00b911cd 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,20 +3,33 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "warn.hh"
 
+class Key_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Key_performer);
+  ~Key_performer ();
+
+protected:
+  virtual bool try_music (Music* req);
+  virtual void create_audio_elements ();
+  virtual void stop_translation_timestep ();
 
-ADD_THIS_TRANSLATOR (Key_performer);
+private:
+  Key_change_ev* key_req_;
+  Audio_key* audio_;
+};
 
 Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
+  key_req_ = 0;
+  audio_ = 0;
 }
 
 Key_performer::~Key_performer ()
@@ -24,39 +37,63 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::do_process_music ()
+Key_performer::create_audio_elements ()
 {
-  if (key_req_l_ && key_req_l_->key_)
+  if (key_req_) 
     {
-      audio_p_ = new Audio_key (); // *key_req_l_->key_);
-      Audio_element_info info (audio_p_, key_req_l_);
+      SCM pitchlist = key_req_->get_property ("pitch-alist");
+      SCM proc = ly_scheme_function ("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);
+		  
+      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");
+      audio_ = new Audio_key (scm_to_int (acc),
+			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+
+      Audio_element_info info (audio_, key_req_);
       announce_element (info);
-      key_req_l_ = 0;
+      key_req_ = 0;
     }
 }
 
 void
-Key_performer::do_pre_move_processing ()
+Key_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
-Key_performer::do_try_music (Music* req_l)
+Key_performer::try_music (Music* req)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
     {
-      if (key_req_l_)
+      if (key_req_)
 	warning (_ ("FIXME: key change merge"));
 
-      key_req_l_ = kc;
+      key_req_ = kc;
       return true;
     }
 
   return false;
 }
 
+ADD_TRANSLATOR (Key_performer,
+		  "","",
+		  "key-change-event",
+		  "","","");