X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fkey-performer.cc;h=ee0afda9eb0b7c9ebec9f547e5ec95a8f3d71943;hb=f2c2c5c43858f323e4708f83fd97e0f38017c275;hp=d80177c26d403480f41edb84c01b3cb56fc04976;hpb=fc5394c7751ea902382ecc9022854583aff0d95e;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index d80177c26d..ee0afda9eb 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,71 +3,102 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
-#include "command-request.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);
+  ~Key_performer ();
 
+protected:
+  virtual bool try_music (Music *ev);
+  virtual void create_audio_elements ();
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
 
-
-ADD_THIS_TRANSLATOR (Key_performer);
+private:
+  Music *key_ev_;
+  Audio_key *audio_;
+};
 
 Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
+  key_ev_ = 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_requests ()
+Key_performer::create_audio_elements ()
 {
-  if (key_req_l_)
+  if (key_ev_)
     {
-      audio_p_ = new Audio_key (key_req_l_->key_);
-      Audio_element_info info (audio_p_, key_req_l_);
+      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);
+
+      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 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),
+			      !minor);
+		    
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_l_ = 0;
+      key_ev_ = 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 *ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+  if (!key_ev_)
     {
-      if (key_req_l_)
-	warning (_ ("FIXME: key change merge"));
-
-      key_req_l_ = kc;
-      return true;
+      key_ev_ = ev;
     }
-
-  return false;
+      
+  return true;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Key_performer,
+		"", "",
+		"key-change-event",
+		"", "");