X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=e96c713ca2dc5cfc8a0f67972747f6a2bf8d108b;hb=029ae298e4c56984889a7fe47dbbc58f6c7055f4;hp=527cf06cbbf6efcfbbc637179b68c0f8bbebc286;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 527cf06cbb..e96c713ca2 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,56 +3,98 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
+  (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 ();
+  virtual void stop_translation_timestep ();
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_TRANSLATOR(Key_performer);
+private:
+  Event* key_ev_;
+  Audio_key* audio_;
+};
 
-Key_performer::Key_performer()
+Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
+  key_ev_ = 0;
+  audio_ = 0;
 }
 
-Key_performer::~Key_performer()
+Key_performer::~Key_performer ()
 {
 }
 
-void 
-Key_performer::do_print() const
+void
+Key_performer::create_audio_elements ()
 {
-#ifndef NPRINT
-  if (key_req_l_)
-  	key_req_l_->print();
-#endif
+  if (key_ev_) 
+    {
+      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 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_ev_);
+      announce_element (info);
+      key_ev_ = 0;
+    }
 }
 
 void
-Key_performer::do_process_requests()
+Key_performer::stop_translation_timestep ()
 {
-  if (key_req_l_)
-	play (new Audio_key (key_req_l_));
-  key_req_l_ = 0;
+  if (audio_)
+    {
+      play_element (audio_);
+      audio_ = 0;
+    }
 }
 
 bool
-Key_performer::do_try_request (Request* req_l)
+Key_performer::try_music (Music* ev)
 {
-  if (key_req_l_)
-	return false;
-
-  if (req_l->command())
-	key_req_l_ = req_l->command()->keychange ();
+  if (Event *kc = dynamic_cast <Event *> (ev))
+    {
+      if (key_ev_)
+	warning (_ ("FIXME: key change merge"));
 
-  if (key_req_l_)
-	return true;
+      key_ev_ = kc;
+      return true;
+    }
 
   return false;
 }
 
+ADD_TRANSLATOR (Key_performer,
+		  "", "",
+		  "key-change-event",
+		  "", "", "");