release: 1.5.25

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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index b728730947e1093b77cbe9470cb78e98f1a7122c..fa2f0fd37c432a0ed494b06403e81c800d8ec770 100644 (file)
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,14 +3,32 @@
 
   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 "tempo-performer.hh"
 #include "command-request.hh"
 #include "audio-item.hh"
+#include "performer.hh"
+
+class Tempo_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  ~Tempo_performer ();
+
+protected:
+
+  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_;
+};
+
+ENTER_DESCRIPTION (Tempo_performer, "","","","","" );
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
 
 Tempo_performer::Tempo_performer ()
 {
@@ -22,23 +40,20 @@ Tempo_performer::~Tempo_performer ()
 {
 }
 
-void 
-Tempo_performer::do_print () const
-{
-#ifndef NPRINT
-  if (tempo_req_l_)
-    tempo_req_l_->print ();
-#endif
-}
 
 void
-Tempo_performer::do_process_music ()
+Tempo_performer::create_audio_elements ()
 {
   if (tempo_req_l_)
     {
-      audio_p_ = new Audio_tempo (tempo_req_l_->dur_.length_mom () /
-                                 Moment (1, 4) 
-                                 * Moment(tempo_req_l_->metronome_i_));
+
+      SCM met = tempo_req_l_->get_mus_property ("metronome-count");
+      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);
       tempo_req_l_ = 0;
@@ -46,7 +61,7 @@ Tempo_performer::do_process_music ()
 }
 
 void
-Tempo_performer::do_pre_move_processing ()
+Tempo_performer::stop_translation_timestep ()
 {
   if (audio_p_)
     {
@@ -56,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;