X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=34864274c48c044df84e2667939e0ece00270ec1;hb=42bd142680a127b608851b5fa1b2145bb42dcd7a;hp=540db7dcacdfc6d8d23a75b737744ea9b18e8662;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 540db7dcac..34864274c4 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,12 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "audio-item.hh"
 #include "performer.hh"
 
+#include "audio-item.hh"
+#include "duration.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
+
 class Tempo_performer : public Performer
 {
 public:
@@ -17,18 +22,23 @@ public:
 
 protected:
 
-  virtual bool try_music (Music *req);
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  virtual void derived_mark () const; 
+  void stop_translation_timestep ();
+  void process_music ();
 private:
-  Music *tempo_req_;
   Audio_tempo *audio_;
+  SCM last_tempo_; 
 };
 
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
+
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_ = 0;
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -37,21 +47,21 @@ Tempo_performer::~Tempo_performer ()
 }
 
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (unsmob_moment (w)
+      && !ly_is_equal (w, last_tempo_))
     {
+      Rational r = unsmob_moment (w)->main_part_;
+      r *= Rational (4, 1);
 
-      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 (r.to_int ());
 
-      audio_ = new Audio_tempo (int (r));
-
-      Audio_element_info info (audio_, tempo_req_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_req_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
@@ -60,21 +70,10 @@ Tempo_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music *req)
-{
-  if (tempo_req_)
-    return false;
-
-  tempo_req_ = req;
-  return true;
-}
-
 ADD_TRANSLATOR (Tempo_performer, "", "",
-		"metronome-change-event",
-		"", "", "");
+		"tempoWholesPerMinute ",
+		"");