X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=8919805e3a3f14bca3bb096746bdf90817024220;hb=cfbe7661413b152a10293f3da7fb412e325254f9;hp=d9a1190dcdf9ffb9672704805c605d4685b37e51;hpb=f4bb931f47bf0a7551d63e72c3a242993ae19ddb;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index d9a1190dcd..8919805e3a 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,33 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "performer.hh"
 
 #include "audio-item.hh"
-#include "performer.hh"
+#include "music.hh"
+#include "duration.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 void stop_translation_timestep ();
-  virtual void create_audio_elements ();
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
-Music* tempo_req_;
-  Audio_tempo* audio_;
+  Music *tempo_event_;
+  Audio_tempo *audio_;
 };
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_ = 0;
+  tempo_event_ = 0;
   audio_ = 0;
 }
 
@@ -37,23 +39,21 @@ Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_)
+  if (tempo_event_)
     {
+      SCM met = tempo_event_->get_property ("metronome-count");
+      Duration *d = unsmob_duration (tempo_event_->get_property ("tempo-unit"));
 
-      SCM met = tempo_req_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_->get_mus_property ("tempo-unit"));
-      
-      Rational r =  (d->get_length () / Moment (Rational (1, 4)) * Moment (gh_scm2int (met))).main_part_;
-      
-      audio_ = new Audio_tempo (int (r));
+      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
 
-      Audio_element_info info (audio_, tempo_req_);
+      audio_ = new Audio_tempo (r.to_int ());
+
+      Audio_element_info info (audio_, tempo_event_);
       announce_element (info);
-      tempo_req_ = 0;
+      tempo_event_ = 0;
     }
 }
 
@@ -68,18 +68,17 @@ Tempo_performer::stop_translation_timestep ()
 }
 
 bool
-Tempo_performer::try_music (Music* req)
+Tempo_performer::try_music (Music *event)
 {
-  if (tempo_req_)
+  if (tempo_event_)
     return false;
 
-      tempo_req_ = req;
-      return true;
+  tempo_event_ = event;
+  return true;
 }
 
+#include "translator.icc"
 
-
-
-ENTER_DESCRIPTION (Tempo_performer, "","",
-		   "tempo-event",
-		   "","","" );
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"metronome-change-event",
+		"", "");