X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=8a12e9bcf5f00b325f3dca5945b56ebba346b6ee;hb=b1e5e3effc79072fd1f2f073dc5be51a1655a3c4;hp=09e0ce0aac77db42adbcb85956d014ffd113ac16;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 09e0ce0aac..8a12e9bcf5 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,13 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #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:
@@ -17,18 +21,18 @@ public:
   ~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;
 }
 
@@ -37,34 +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_req_->get_property ("pitch-alist");
-      SCM proc = ly_scheme_function ("alterations-in-key");
-      
+      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, 
+
+      Pitch key_do (0,
 		    scm_to_int (scm_caar (pitchlist)),
-		    scm_to_int (scm_cdar (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 minor = scm_c_eval_string ("minor");
+
+      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),
-			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+			      !minor);
 
-      Audio_element_info info (audio_, key_req_);
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -73,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 */
+		""
+		);