* lily/include/group-interface.hh (extract_grob_array): rename

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 27144dba57beaf01024fde67873b00342d8d84d8..e96c713ca2dc5cfc8a0f67972747f6a2bf8d108b 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,37 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
+#include "music-sequence.hh"
 #include "audio-item.hh"
 #include "performer.hh"
+#include "warn.hh"
 
 class Key_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Key_performer();
-  ~Key_performer();
+  TRANSLATOR_DECLARATIONS (Key_performer);
+  ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req_l);
-  virtual void create_grobs ();
+  virtual bool try_music (Music* ev);
+  virtual void create_audio_elements ();
   virtual void stop_translation_timestep ();
 
 private:
-  Key_change_req* key_req_l_;
-  Audio_key* audio_p_;
+  Event* key_ev_;
+  Audio_key* audio_;
 };
 
-ADD_THIS_TRANSLATOR (Key_performer);
-
 Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
+  key_ev_ = 0;
+  audio_ = 0;
 }
 
 Key_performer::~Key_performer ()
@@ -41,40 +38,63 @@ Key_performer::~Key_performer ()
 }
 
 void
-Key_performer::create_grobs ()
+Key_performer::create_audio_elements ()
 {
-  if (key_req_l_ &&
-      gh_list_p (key_req_l_->get_mus_property ("pitch-alist")))
+  if (key_ev_) 
     {
-      audio_p_ = new Audio_key (); // *key_req_l_->key_);
-      Audio_element_info info (audio_p_, key_req_l_);
+      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 minor = scm_c_eval_string ("minor");
+      audio_ = new Audio_key (scm_to_int (acc),
+                             SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
+
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_l_ = 0;
+      key_ev_ = 0;
     }
 }
 
 void
 Key_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
-Key_performer::try_music (Music* req_l)
+Key_performer::try_music (Music* ev)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+  if (Event *kc = dynamic_cast <Event *> (ev))
     {
-      if (key_req_l_)
+      if (key_ev_)
        warning (_ ("FIXME: key change merge"));
 
-      key_req_l_ = kc;
+      key_ev_ = kc;
       return true;
     }
 
   return false;
 }
 
+ADD_TRANSLATOR (Key_performer,
+                 "", "",
+                 "key-change-event",
+                 "", "", "");