X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=c58ba137f69bbc575b73acd0fe6a56717ecb4d2c;hb=a7f82e4dc22fc6219a9fe0f6874f8c91e3f31f24;hp=bb9f4ae7626435738afedefe6f25f869b71a9236;hpb=4a0cd6bf85b47b7a647fcdcd8b0ce6832e5a1b1c;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index bb9f4ae762..c58ba137f6 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,71 +3,82 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "tempo-performer.hh"
-#include "command-request.hh"
+#include "performer.hh"
+
 #include "audio-item.hh"
+#include "music.hh"
+#include "duration.hh"
+
+class Tempo_performer : public Performer
+{
+public:
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
+  ~Tempo_performer ();
+
+protected:
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
+  virtual bool try_music (Music *req);
+  PRECOMPUTED_VIRTUAL void stop_translation_timestep ();
+  virtual void create_audio_elements ();
+
+private:
+  Music *tempo_req_;
+  Audio_tempo *audio_;
+};
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
+  tempo_req_ = 0;
+  audio_ = 0;
 }
 
 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_requests ()
+Tempo_performer::create_audio_elements ()
 {
-  if (tempo_req_l_)
+  if (tempo_req_)
     {
-      audio_p_ = new Audio_tempo (tempo_req_l_->dur_.length_mom () /
-				  Moment (1, 4) 
-				  * Moment(tempo_req_l_->metronome_i_));
-      Audio_element_info info (audio_p_, tempo_req_l_);
+      SCM met = tempo_req_->get_property ("metronome-count");
+      Duration *d = unsmob_duration (tempo_req_->get_property ("tempo-unit"));
+
+      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
+
+      audio_ = new Audio_tempo (int (r));
+
+      Audio_element_info info (audio_, tempo_req_);
       announce_element (info);
-      tempo_req_l_ = 0;
+      tempo_req_ = 0;
     }
 }
 
 void
-Tempo_performer::do_pre_move_processing ()
+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::do_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;
-      return true;
-    }
-
-  return false;
+  tempo_req_ = req;
+  return true;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"metronome-change-event",
+		"", "", "");