release: 1.5.7

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 7f2e9e171bdc17ae6ec42d6ca70c810bfb5a5374..e9454129248d817795e5f4f70be81748c3609f21 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -3,9 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "lily-guile.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
 #include "performer.hh"
@@ -13,10 +14,10 @@
 class Key_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
+  VIRTUAL_COPY_CONS (Translator);
   
-  Key_performer();
-  ~Key_performer();
+  Key_performer ();
+  ~Key_performer ();
 
 protected:
   virtual bool try_music (Music* req_l);
@@ -43,10 +44,14 @@ Key_performer::~Key_performer ()
 void
 Key_performer::create_audio_elements ()
 {
-  if (key_req_l_ &&
-      gh_list_p (key_req_l_->get_mus_property ("pitch-alist")))
+  if (key_req_l_) 
     {
-      audio_p_ = new Audio_key (); // *key_req_l_->key_);
+      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;