X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=557e03c1aa612817c297641c59c4f3996715305c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=9a70f9cdc4d78a4ceec4a45d1249b76587e03656;hpb=9f3572d98bb948c9689cd1f75401a029451fa001;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 9a70f9cdc4..557e03c1aa 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,14 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
 
 #include "audio-item.hh"
-#include "music.hh"
 #include "duration.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
 class Tempo_performer : public Performer
 {
@@ -20,18 +22,23 @@ public:
 
 protected:
 
-  virtual bool try_music (Music *event);
+  virtual void derived_mark () const; 
   void stop_translation_timestep ();
   void process_music ();
-
 private:
-  Music *tempo_event_;
   Audio_tempo *audio_;
+  SCM last_tempo_; 
 };
 
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
+
 Tempo_performer::Tempo_performer ()
 {
-  tempo_event_ = 0;
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -42,18 +49,19 @@ Tempo_performer::~Tempo_performer ()
 void
 Tempo_performer::process_music ()
 {
-  if (tempo_event_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (unsmob_moment (w)
+      && !ly_is_equal (w, last_tempo_))
     {
-      SCM met = tempo_event_->get_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_event_->get_property ("tempo-unit"));
-
-      Rational r = (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
+      Rational r = unsmob_moment (w)->main_part_;
+      r *= Rational (4, 1);
 
       audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_, tempo_event_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_event_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
@@ -62,23 +70,20 @@ Tempo_performer::stop_translation_timestep ()
 {
   if (audio_)
     {
-      play_element (audio_);
       audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music *event)
-{
-  if (tempo_event_)
-    return false;
+ADD_TRANSLATOR (Tempo_performer,
+		/* doc */
+		"",
 
-  tempo_event_ = event;
-  return true;
-}
+		/* create */
+		"",
 
-#include "translator.icc"
+		/* read */
+		"tempoWholesPerMinute ",
 
-ADD_TRANSLATOR (Tempo_performer, "", "",
-		"metronome-change-event",
-		"", "");
+		/* write */
+		""
+		);