X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=540db7dcacdfc6d8d23a75b737744ea9b18e8662;hb=7e79448be56dad04b97e89e0c49dce64bf16100e;hp=77058f8ee44046ecbb71c46dc743dea2a976e2a0;hpb=b1323f33e9aa4b9eea05eefb8755c907d4d762d4;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 77058f8ee4..540db7dcac 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,28 +3,27 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-
 #include "audio-item.hh"
 #include "performer.hh"
 
 class Tempo_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
   ~Tempo_performer ();
 
 protected:
 
-  virtual bool try_music (Music* req);
+  virtual bool try_music (Music *req);
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
 
 private:
-Music* tempo_req_;
-  Audio_tempo* audio_;
+  Music *tempo_req_;
+  Audio_tempo *audio_;
 };
 
 Tempo_performer::Tempo_performer ()
@@ -37,7 +36,6 @@ Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
 Tempo_performer::create_audio_elements ()
 {
@@ -46,9 +44,9 @@ Tempo_performer::create_audio_elements ()
 
       SCM met = tempo_req_->get_property ("metronome-count");
       Duration *d = unsmob_duration (tempo_req_->get_property ("tempo-unit"));
-      
-      Rational r =  (d->get_length () / Moment (Rational (1, 4)) * Moment (gh_scm2int (met))).main_part_;
-      
+
+      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
+
       audio_ = new Audio_tempo (int (r));
 
       Audio_element_info info (audio_, tempo_req_);
@@ -68,18 +66,15 @@ Tempo_performer::stop_translation_timestep ()
 }
 
 bool
-Tempo_performer::try_music (Music* req)
+Tempo_performer::try_music (Music *req)
 {
   if (tempo_req_)
     return false;
 
-      tempo_req_ = req;
-      return true;
+  tempo_req_ = req;
+  return true;
 }
 
-
-
-
-ENTER_DESCRIPTION (Tempo_performer, "","",
-		   "metronome-change-event",
-		   "","","" );
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"metronome-change-event",
+		"", "", "");