Compile fix.

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

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index 77fe3a9b62fbb5c88b0a4f9ced582d9037de96fa..66ca419f1e12dee08ba825ebda8e78a57952d09a 100644 (file)
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -20,19 +20,19 @@ public:
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req_l);
+  virtual bool try_music (Music* req);
   virtual void create_audio_elements ();
   virtual void stop_translation_timestep ();
 
 private:
-  Key_change_req* key_req_l_;
-  Audio_key* audio_p_;
+  Key_change_req* key_req_;
+  Audio_key* audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_l_ = 0;
-  audio_p_ = 0;
+  key_req_ = 0;
+  audio_ = 0;
 }
 
 Key_performer::~Key_performer ()
@@ -42,9 +42,13 @@ Key_performer::~Key_performer ()
 void
 Key_performer::create_audio_elements ()
 {
-  if (key_req_l_) 
+  if (key_req_) 
     {
-      SCM pitchlist = key_req_l_->get_mus_property ("pitch-alist");
+
+      /*
+       UGH. primitive-eval.
+       */
+      SCM pitchlist = key_req_->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"));
@@ -58,44 +62,44 @@ Key_performer::create_audio_elements ()
                   -gh_scm2int (ly_cdar (pitchlist)));
 
       my_do.transpose (to_c);
-      to_c.alteration_i_ -= my_do.alteration_i_;
+      to_c.alteration_ -= my_do.alteration_;
 
-      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 c_pitchlist = transpose_key_alist (pitchlist, to_c.smobbed_copy());
       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_);
+      audio_ = new Audio_key (gh_scm2int (acc), major == SCM_BOOL_T); 
+      Audio_element_info info (audio_, key_req_);
       announce_element (info);
-      key_req_l_ = 0;
+      key_req_ = 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* req)
 {
-  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req_l))
+  if (Key_change_req *kc = dynamic_cast <Key_change_req *> (req))
     {
-      if (key_req_l_)
+      if (key_req_)
        warning (_ ("FIXME: key change merge"));
 
-      key_req_l_ = kc;
+      key_req_ = kc;
       return true;
     }
 
   return false;
 }
 
-ENTER_DESCRIPTION(Key_performer,"","","","","");
+ENTER_DESCRIPTION(Key_performer,
+                 "","",
+                 "general-music",
+                 "","","");