X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=c699aea225fdd6ebf922d1a5b0b65ede9648dd44;hb=6b0464424f51e8b4cb6e1bdac3ff21bd610ba28b;hp=5691cdf5e2a8401d77388810381242235aa328c0;hpb=5d5fbb2641fda6605cde61ebcd99b9bef2e94b4a;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 5691cdf5e2..c699aea225 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,38 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
+
 #include "audio-item.hh"
 #include "performer.hh"
 
 class Tempo_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Tempo_performer();
-  ~Tempo_performer();
+  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  ~Tempo_performer ();
 
 protected:
 
-  virtual bool try_music (Music* req_l);
+  virtual bool try_music (Music* req);
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
 
 private:
-  Tempo_req* tempo_req_l_;
-  Audio_tempo* audio_p_;
+Music* tempo_req_;
+  Audio_tempo* audio_;
 };
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
-
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
+  tempo_req_ = 0;
+  audio_ = 0;
 }
 
 Tempo_performer::~Tempo_performer ()
@@ -45,45 +41,45 @@ Tempo_performer::~Tempo_performer ()
 void
 Tempo_performer::create_audio_elements ()
 {
-  if (tempo_req_l_)
+  if (tempo_req_)
     {
 
-      SCM met = tempo_req_l_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_l_->get_mus_property ("duration"));
+      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_p_ = new Audio_tempo (d->length_mom () /
-				  Moment (1, 4) 
-				  * Moment(gh_scm2int (met)));
+      audio_ = new Audio_tempo (int (r));
 
-      Audio_element_info info (audio_p_, tempo_req_l_);
+      Audio_element_info info (audio_, tempo_req_);
       announce_element (info);
-      tempo_req_l_ = 0;
+      tempo_req_ = 0;
     }
 }
 
 void
 Tempo_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
 }
 
 bool
-Tempo_performer::try_music (Music* req_l)
+Tempo_performer::try_music (Music* req)
 {
-  if (tempo_req_l_)
+  if (tempo_req_)
     return false;
 
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req_l))
-    {
-      tempo_req_l_ = t;
+      tempo_req_ = req;
       return true;
-    }
-
-  return false;
 }
 
+
+
+
+ENTER_DESCRIPTION (Tempo_performer, "","",
+		   "metronome-change-event",
+		   "","","" );