X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=9443d33eff0cf2d580cd36a7d413a9bd6c227a63;hb=4a9a2dcf5b062075c01f019da36963ec7ae34b7b;hp=0ed1f33afab5c2f24f05df44563cffb80bc8b5c8;hpb=6a0ea5e307744ad53d8b4a7381f2b27c2cfc9c13;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 0ed1f33afa..9443d33eff 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,63 +3,105 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
-#include "command-request.hh"
-#include "midi-item.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_STATIC_NAME(Key_performer);
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_PERFORMER(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 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_ ) {
-	int sharps_i = key_req_l_->sharps_i();
-	int flats_i = key_req_l_->flats_i();
-	// midi cannot handle non-conventional keys
-	if ( !( flats_i && sharps_i ) ) {
-	    Midi_key k( sharps_i - flats_i, key_req_l_->minor_b() );
-	    play_event( &k );
-	}
-	key_req_l_ = 0;
+  if (audio_)
+    {
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
-Key_performer::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 ( key_req_l_ )
-	return true;
+  if (Event *kc = dynamic_cast<Event *> (ev))
+    {
+      if (!key_ev_)
+	{
+	  key_ev_ = kc;
+	}
+      
+      return true;
+    }
 
-    return false;
+  return false;
 }
 
+ADD_TRANSLATOR (Key_performer,
+		"", "",
+		"key-change-event",
+		"", "", "");