X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=327a53c042d50f0eeecd804a398c673a9294cea1;hb=dc874af424d0a283b76d45997f77b15a98afec84;hp=8ebe88b0ebf3f8256eca9bb43b55e513066719e4;hpb=e5af54f2e79647982f51d184fa49f419568be4b3;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 8ebe88b0eb..327a53c042 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,35 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.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);
+  TRANSLATOR_DECLARATIONS (Key_performer);
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req);
-  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_ev* key_req_;
-  Audio_key* audio_;
+  Stream_event *key_ev_;
+  Audio_key *audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -40,40 +41,40 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_audio_elements ()
+Key_performer::process_music ()
 {
-  if (key_req_) 
+  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)),
+		    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);
 
-      /*
-	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);
- 
-      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 = my_do.transposed (to_c);
-      to_c = my_do.transposed (Pitch(0,0,- my_do.get_alteration ()));
-
-      SCM c_pitchlist = transpose_key_alist (pitchlist, to_c.smobbed_copy());
-
-      /*
-	MIDI keys are too limited for lilypond scales.
-
-	TODO: should probably detect minor key, though.
-      */
-      audio_ = new Audio_key (gh_scm2int (acc), true); 
-      Audio_element_info info (audio_, key_req_);
+      audio_ = new Audio_key (scm_to_int (acc),
+			      !minor);
+
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -82,27 +83,28 @@ Key_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Key_performer::try_music (Music* req)
+IMPLEMENT_TRANSLATOR_LISTENER (Key_performer, key_change);
+void
+Key_performer::listen_key_change (Stream_event *ev)
 {
-  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
-    {
-      if (key_req_)
-	warning (_ ("FIXME: key change merge"));
+  if (!key_ev_)
+    key_ev_ = ev;
+}
 
-      key_req_ = kc;
-      return true;
-    }
+ADD_TRANSLATOR (Key_performer,
+		/* doc */
+		"",
 
-  return false;
-}
+		/* create */
+		"",
+
+		/* read */
+		"",
 
-ENTER_DESCRIPTION(Key_performer,
-		  "","",
-		  "key-change-event",
-		  "","","");
+		/* write */
+		""
+		);