X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=e9454129248d817795e5f4f70be81748c3609f21;hb=20091095d3ac112fa0d0c55c8e2b8092584be4b2;hp=5e620ff7c98666607bd2ae152d28d21927d9dba0;hpb=48bdd9154a32245a075494b403639181615864e2;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 5e620ff7c9..e945412924 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,63 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
+#include "lily-guile.hh"
 #include "command-request.hh"
-#include "midi-item.hh"
+#include "audio-item.hh"
+#include "performer.hh"
 
+class Key_performer : public Performer
+{
+public:
+  VIRTUAL_COPY_CONS (Translator);
+  
+  Key_performer ();
+  ~Key_performer ();
+
+protected:
+  virtual bool try_music (Music* req_l);
+  virtual void create_audio_elements ();
+  virtual void stop_translation_timestep ();
 
+private:
+  Key_change_req* key_req_l_;
+  Audio_key* audio_p_;
+};
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_PERFORMER(Key_performer);
+ADD_THIS_TRANSLATOR (Key_performer);
 
-Key_performer::Key_performer()
+Key_performer::Key_performer ()
 {
-    key_req_l_ = 0;
+  key_req_l_ = 0;
+  audio_p_ = 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_req_l_) 
+    {
+      SCM pitchlist = key_req_l_->get_mus_property ("pitch-alist");
+      SCM proc = scm_primitive_eval (ly_symbol2scm ("accidentals-in-key")); 
+      SCM acc = gh_call1 (proc, pitchlist);
+      proc = scm_primitive_eval (ly_symbol2scm ("major-key"));
+      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_);
+      announce_element (info);
+      key_req_l_ = 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_p_)
+    {
+      play_element (audio_p_);
+      audio_p_ = 0;
     }
 }
 
 bool
-Key_performer::do_try_request( Request* req_l )
+Key_performer::try_music (Music* req_l)
 {
-    if ( key_req_l_ )
-	return false;
-
-    if ( req_l->command() )
-	key_req_l_ = req_l->command()->keychange();
+  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+    {
+      if (key_req_l_)
+	warning (_ ("FIXME: key change merge"));
 
-    if ( key_req_l_ )
-	return true;
+      key_req_l_ = kc;
+      return true;
+    }
 
-    return false;
+  return false;
 }