X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fkey-performer.cc;h=f77c1dfce3def90c8ec679117a92f0320bbf7579;hb=810defa88e1c382cf3bb1715a77b883d0b1c85a0;hp=c9ced39f6ab631d1d43891859a55ed880d1e1cf7;hpb=ed2f7473be57e99f15acc48c06fe18fed27d43b3;p=lilypond.git

diff --git a/lily/key-performer.cc b/lily/key-performer.cc
index c9ced39f6a..f77c1dfce3 100644
--- a/lily/key-performer.cc
+++ b/lily/key-performer.cc
@@ -6,13 +6,11 @@
   (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "lily-guile.hh"
-
+#include "music-sequence.hh"
 #include "audio-item.hh"
 #include "performer.hh"
 #include "warn.hh"
 
-
 class Key_performer : public Performer
 {
 public:
@@ -20,18 +18,18 @@ public:
   ~Key_performer ();
 
 protected:
-  virtual bool try_music (Music* req);
+  virtual bool try_music (Music* ev);
   virtual void create_audio_elements ();
   virtual void stop_translation_timestep ();
 
 private:
-  Key_change_ev* key_req_;
+  Event* key_ev_;
   Audio_key* audio_;
 };
 
 Key_performer::Key_performer ()
 {
-  key_req_ = 0;
+  key_ev_ = 0;
   audio_ = 0;
 }
 
@@ -42,32 +40,32 @@ Key_performer::~Key_performer ()
 void
 Key_performer::create_audio_elements ()
 {
-  if (key_req_) 
+  if (key_ev_) 
     {
-      SCM pitchlist = key_req_->get_property ("pitch-alist");
-      SCM proc = ly_scheme_function ("alterations-in-key");
+      SCM pitchlist = key_ev_->get_property ("pitch-alist");
+      SCM proc = ly_lily_module_constant ("alterations-in-key");
       
-      SCM acc = gh_call1 (proc, pitchlist);
+      SCM acc = scm_call_1 (proc, pitchlist);
       
       Pitch key_do (0, 
-		    gh_scm2int (ly_caar (pitchlist)),
-		    gh_scm2int (ly_cdar (pitchlist)));
+		    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,
-				  interval (key_do, c_do).smobbed_copy ());
+				  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 (gh_scm2int (acc),
+      audio_ = new Audio_key (scm_to_int (acc),
 			      SCM_BOOL_T != scm_equal_p (minor, c_pitchlist));
 
-      Audio_element_info info (audio_, key_req_);
+      Audio_element_info info (audio_, key_ev_);
       announce_element (info);
-      key_req_ = 0;
+      key_ev_ = 0;
     }
 }
 
@@ -82,21 +80,21 @@ Key_performer::stop_translation_timestep ()
 }
 
 bool
-Key_performer::try_music (Music* req)
+Key_performer::try_music (Music* ev)
 {
-  if (Key_change_ev *kc = dynamic_cast <Key_change_ev *> (req))
+  if (Event *kc = dynamic_cast <Event *> (ev))
     {
-      if (key_req_)
+      if (key_ev_)
 	warning (_ ("FIXME: key change merge"));
 
-      key_req_ = kc;
+      key_ev_ = kc;
       return true;
     }
 
   return false;
 }
 
-ENTER_DESCRIPTION (Key_performer,
+ADD_TRANSLATOR (Key_performer,
 		  "","",
 		  "key-change-event",
 		  "","","");