X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=1f35d780c43f03eb6adcdd4137217d31f7ef873b;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=74f702c6afaabb9e55dedd7f83bdf6f5688d8ee3;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 74f702c6af..1f35d780c4 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,38 +3,37 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.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:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Key_performer ();
+  TRANSLATOR_DECLARATIONS (Key_performer);
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req_l);
-  virtual void create_audio_elements ();
-  virtual void stop_translation_timestep ();
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (key_change);
 private:
-  Key_change_req* key_req_l_;
-  Audio_key* audio_p_;
+  Stream_event *key_ev_;
+  Audio_key *audio_;
 };
 
-ADD_THIS_TRANSLATOR (Key_performer);
-
 Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
+  key_ev_ = 0;
+  audio_ = 0;
 }
 
 Key_performer::~Key_performer ()
@@ -42,44 +41,70 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_req_l_) 
+  if (key_ev_)
     {
-      SCM pitchlist = key_req_l_->get_mus_property ("pitch-alist");
-      SCM proc = scm_eval2 (ly_symbol2scm ("accidentals-in-key"), SCM_EOL); 
-      SCM acc = gh_call1 (proc, pitchlist);
-      proc = scm_eval2 (ly_symbol2scm ("major-key"), SCM_EOL);
-      SCM major = gh_call1 (proc, pitchlist);
-      audio_p_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
-      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)),
+		    ly_scm2rational (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_number (scm_cdr (third))
+		    && ly_scm2rational (scm_cdr (third)) == FLAT_ALTERATION);
+
+      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::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
 
-bool
-Key_performer::try_music (Music* req_l)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
-    {
-      if (key_req_l_)
-	warning (_ ("FIXME: key change merge"));
+  if (!key_ev_)
+    key_ev_ = ev;
+}
 
-      key_req_l_ = kc;
-      return true;
-    }
+ADD_TRANSLATOR (Key_performer,
+		/* doc */
+		"",
 
-  return false;
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
 
+		/* write */
+		""
+		);