*** empty log message ***

[lilypond.git] / lily / key-performer.cc

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 6c4132a451e8e9105bc1c7019c2a85f19a8d507f..e67c68f27dd5170040700c090183e022538786be 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,71 +3,103 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
-#include "command-request.hh"
+#include "lily-guile.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_req* 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 ()
 {
 }
 
-void 
-Key_performer::do_print () const
-{
-#ifndef NPRINT
-  if (key_req_l_)
-    key_req_l_->print ();
-#endif
-}
-
 void
-Key_performer::do_process_music ()
+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_);
+
+      /*
+       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)));
+                 
+      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 = transpose_key_alist (pitchlist, to_c.smobbed_copy());
+      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,
+                 "","",
+                 "key-change-event",
+                 "","","");