X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=61e3592630577e782c5edc3478c177df7aa1b6bd;hb=d9bc24cb0b51b2d863e8d816c203137b88daec5c;hp=160dee4a64a72c015b4a377aed084b4689ecd687;hpb=2862b1027f316a2f0444fa92e441ee28acf7a463;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 160dee4a64..61e3592630 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 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
-#include "command-request.hh"
 #include "audio-item.hh"
+#include "music-sequence.hh"
+#include "performer.hh"
+#include "stream-event.hh"
+#include "warn.hh"
 
+#include "translator.icc"
 
+class Key_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Key_performer);
+  ~Key_performer ();
+
+protected:
+  void process_music ();
+  void stop_translation_timestep ();
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_PERFORMER(Key_performer);
+  DECLARE_TRANSLATOR_LISTENER (key_change);
+private:
+  Stream_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::process_music ()
 {
-#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 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_ev_ = 0;
+    }
 }
 
 void
-Key_performer::process_requests()
+Key_performer::stop_translation_timestep ()
 {
-  if (key_req_l_)
-	play (new Audio_key (key_req_l_));
-  key_req_l_ = 0;
+  if (audio_)
+    {
+      audio_ = 0;
+    }
 }
 
-bool
-Key_performer::do_try_request (Request* req_l)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (key_req_l_)
-	return false;
-
-  if (req_l->command())
-	key_req_l_ = req_l->command()->keychange ();
-
-  if (key_req_l_)
-	return true;
-
-  return false;
+  if (!key_ev_)
+    key_ev_ = ev;
 }
 
+ADD_TRANSLATOR (Key_performer,
+		"", "",
+		"", "");