release: 1.5.44

[lilypond.git] / lily / key-performer.cc

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 5affa0c1f3266415b2839b2a5aa1135958990012..77fe3a9b62fbb5c88b0a4f9ced582d9037de96fa 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,56 +3,99 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "key-performer.hh"
+#include "lily-guile.hh"
 #include "command-request.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* req_l);
+  virtual void create_audio_elements ();
+  virtual void stop_translation_timestep ();
 
-IMPLEMENT_IS_TYPE_B1(Key_performer,Performer);
-ADD_THIS_PERFORMER(Key_performer);
+private:
+  Key_change_req* key_req_l_;
+  Audio_key* audio_p_;
+};
 
-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"));
+ 
+      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.transpose (to_c);
+      to_c.alteration_i_ -= my_do.alteration_i_;
+
+      Key_change_req *key = new Key_change_req;
+      key->set_mus_property ("pitch-alist", scm_list_copy (pitchlist));
+      ((Music*)key)->transpose (to_c);
+      SCM c_pitchlist = key->get_mus_property ("pitch-alist");
+      SCM major = gh_call1 (proc, c_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_ )
-       play( new Audio_key( key_req_l_ ) );
-    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;
 }
 
+ENTER_DESCRIPTION(Key_performer,"","","","","");