X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=7401a637de01672927c1ce887d804afc064152bd;hb=d182d030b396d66a84efa13d947fbbdfb7240874;hp=7e09fefbc69eb287504c45da951f441cded57dbc;hpb=2fd5f86de0500ecd9a3f47a2540c3b304f835ef4;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 7e09fefbc6..7401a637de 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,68 +3,99 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
+#include "lily-guile.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+#include "warn.hh"
 
-ADD_THIS_TRANSLATOR (Key_performer);
 
-Key_performer::Key_performer ()
+class Key_performer : public Performer
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS(Key_performer);
+  ~Key_performer ();
 
-Key_performer::~Key_performer ()
+protected:
+  virtual bool try_music (Music* req);
+  virtual void create_audio_elements ();
+  virtual void stop_translation_timestep ();
+
+private:
+  Key_change_req* key_req_;
+  Audio_key* audio_;
+};
+
+Key_performer::Key_performer ()
 {
+  key_req_ = 0;
+  audio_ = 0;
 }
 
-void 
-Key_performer::do_print () const
+Key_performer::~Key_performer ()
 {
-#ifndef NPRINT
-  if (key_req_l_)
-    key_req_l_->print ();
-#endif
 }
 
 void
-Key_performer::do_process_requests ()
+Key_performer::create_audio_elements ()
 {
-  if (key_req_l_)
+  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_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)));
+		  
+      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_;
+
+      Key_change_req *key = new Key_change_req;
+      key->set_mus_property ("pitch-alist", scm_list_copy (pitchlist));
+      ((Music*)key)->transpose (to_c);
+      SCM c_pitchlist = key->get_mus_property ("pitch-alist");
+      SCM major = gh_call1 (proc, c_pitchlist);
+
+      audio_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
+      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_req *kc = dynamic_cast <Key_change_req *> (req))
     {
-      if (key_req_l_)
+      if (key_req_)
 	warning (_ ("FIXME: key change merge"));
 
-      key_req_l_ = kc;
+      key_req_ = kc;
       return true;
     }
 
   return false;
 }
 
+ENTER_DESCRIPTION(Key_performer,"","","","","");