X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=8919805e3a3f14bca3bb096746bdf90817024220;hb=89d91900e92074780acaadc4361b2d99c8ec0ac3;hp=413b45ce2344f1858a3aba435d906ed7e2e5e3cf;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 413b45ce23..8919805e3a 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,87 +3,82 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
-#include "audio-item.hh"
 #include "performer.hh"
 
+#include "audio-item.hh"
+#include "music.hh"
+#include "duration.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 void stop_translation_timestep ();
-  virtual void create_audio_elements ();
+  virtual bool try_music (Music *event);
+  void stop_translation_timestep ();
+  void process_music ();
 
 private:
-  Tempo_req* tempo_req_l_;
-  Audio_tempo* audio_p_;
+  Music *tempo_event_;
+  Audio_tempo *audio_;
 };
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
-
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
+  tempo_event_ = 0;
+  audio_ = 0;
 }
 
 Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_l_)
+  if (tempo_event_)
     {
+      SCM met = tempo_event_->get_property ("metronome-count");
+      Duration *d = unsmob_duration (tempo_event_->get_property ("tempo-unit"));
 
-      SCM met = tempo_req_l_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_l_->get_mus_property ("tempo"));
-      
-      audio_p_ = new Audio_tempo (d->length_mom () /
-				  Moment (1, 4) 
-				  * Moment(gh_scm2int (met)));
+      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
 
-      Audio_element_info info (audio_p_, tempo_req_l_);
+      audio_ = new Audio_tempo (r.to_int ());
+
+      Audio_element_info info (audio_, tempo_event_);
       announce_element (info);
-      tempo_req_l_ = 0;
+      tempo_event_ = 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 *event)
 {
-  if (tempo_req_l_)
+  if (tempo_event_)
     return false;
 
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req_l))
-    {
-      tempo_req_l_ = t;
-      return true;
-    }
-
-  return false;
+  tempo_event_ = event;
+  return true;
 }
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"metronome-change-event",
+		"", "");