release: 1.3.109

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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index e4066580ca7da4d61d7e0262b7d145b858706a45..015914aefba3542abfa9288d7e927318dbf1ca4f 100644 (file)
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -6,9 +6,28 @@
   (c)  1997--2000 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:
+  VIRTUAL_COPY_CONS(Translator);
+  
+  Tempo_performer();
+  ~Tempo_performer();
+
+protected:
+
+  virtual bool try_music (Music* req_l);
+  virtual void stop_translation_timestep ();
+  virtual void create_grobs ();
+
+private:
+  Tempo_req* tempo_req_l_;
+  Audio_tempo* audio_p_;
+};
 
 ADD_THIS_TRANSLATOR (Tempo_performer);
 
@@ -24,13 +43,16 @@ Tempo_performer::~Tempo_performer ()
 
 
 void
-Tempo_performer::do_process_music ()
+Tempo_performer::create_grobs ()
 {
   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(tempo_req_l_->metronome_i_));
+                                 * Moment(gh_scm2int (met)));
+
       Audio_element_info info (audio_p_, tempo_req_l_);
       announce_element (info);
       tempo_req_l_ = 0;
@@ -38,7 +60,7 @@ Tempo_performer::do_process_music ()
 }
 
 void
-Tempo_performer::do_pre_move_processing ()
+Tempo_performer::stop_translation_timestep ()
 {
   if (audio_p_)
     {
@@ -48,7 +70,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;