patch::: 1.5.26.jcn1

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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 3b57dccd47a297070ba09a7e24ce2345b343fc26..fa2f0fd37c432a0ed494b06403e81c800d8ec770 100644 (file)
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "command-request.hh"
@@ -13,23 +13,22 @@
 class Tempo_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Tempo_performer();
-  ~Tempo_performer();
+  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  ~Tempo_performer ();
 
 protected:
 
-  virtual bool do_try_music (Music* req_l);
-  virtual void do_pre_move_processing ();
-  virtual void process_acknowledged ();
+  virtual bool try_music (Music* req_l);
+  virtual void stop_translation_timestep ();
+  virtual void create_audio_elements ();
 
 private:
   Tempo_req* tempo_req_l_;
   Audio_tempo* audio_p_;
 };
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
+ENTER_DESCRIPTION (Tempo_performer, "","","","","" );
+
 
 Tempo_performer::Tempo_performer ()
 {
@@ -43,15 +42,17 @@ Tempo_performer::~Tempo_performer ()
 
 
 void
-Tempo_performer::process_acknowledged ()
+Tempo_performer::create_audio_elements ()
 {
   if (tempo_req_l_)
     {
 
       SCM met = tempo_req_l_->get_mus_property ("metronome-count");
-      audio_p_ = new Audio_tempo (tempo_req_l_->dur_.length_mom () /
-                                 Moment (1, 4) 
-                                 * Moment(gh_scm2int (met)));
+      Duration *d = unsmob_duration (tempo_req_l_->get_mus_property ("duration"));
+      
+      Rational r =  (d->length_mom () / Moment (Rational (1, 4)) * Moment (gh_scm2int (met))).main_part_;
+      
+      audio_p_ = new Audio_tempo (int (r));
 
       Audio_element_info info (audio_p_, tempo_req_l_);
       announce_element (info);
@@ -60,7 +61,7 @@ Tempo_performer::process_acknowledged ()
 }
 
 void
-Tempo_performer::do_pre_move_processing ()
+Tempo_performer::stop_translation_timestep ()
 {
   if (audio_p_)
     {
@@ -70,7 +71,7 @@ Tempo_performer::do_pre_move_processing ()
 }
 
 bool
-Tempo_performer::do_try_music (Music* req_l)
+Tempo_performer::try_music (Music* req_l)
 {
   if (tempo_req_l_)
     return false;