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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 413b45ce23..d7975c5719 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,87 +3,87 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
-#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:
-  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 void derived_mark () const; 
+  void stop_translation_timestep ();
+  void process_music ();
 private:
-  Tempo_req* tempo_req_l_;
-  Audio_tempo* audio_p_;
+  Audio_tempo *audio_;
+  SCM last_tempo_; 
 };
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
+  last_tempo_ = SCM_EOL;
+  audio_ = 0;
 }
 
 Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_l_)
+  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_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)));
+      audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_p_, tempo_req_l_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_req_l_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
 void
 Tempo_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
 
-bool
-Tempo_performer::try_music (Music* req_l)
-{
-  if (tempo_req_l_)
-    return false;
+ADD_TRANSLATOR (Tempo_performer,
+		/* doc */
+		"",
 
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req_l))
-    {
-      tempo_req_l_ = t;
-      return true;
-    }
+		/* create */
+		"",
 
-  return false;
-}
+		/* read */
+		"tempoWholesPerMinute ",
 
+		/* write */
+		""
+		);