X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=ac537891ef2c1a8b6bfecf2b2d37a87e7f267922;hb=fba53fe32502b6d62ffbd251e1fbf22e5e5ed24f;hp=a6d864b5c7210d87f70dd0a75e7c050f961993d0;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index a6d864b5c7..ac537891ef 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,36 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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:
-  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
   ~Tempo_performer ();
 
 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:
-  Tempo_req* tempo_req_;
-  Audio_tempo* audio_;
+  Audio_tempo *audio_;
+  SCM last_tempo_; 
 };
 
-ENTER_DESCRIPTION (Tempo_performer, "","","","","" );
-
+void
+Tempo_performer::derived_mark () const
+{
+  scm_gc_mark (last_tempo_);
+}
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_ = 0;
+  last_tempo_ = SCM_EOL;
   audio_ = 0;
 }
 
@@ -40,23 +46,22 @@ 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_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_->get_mus_property ("duration"));
-      
-      Rational r =  (d->length_mom () / Moment (Rational (1, 4)) * Moment (gh_scm2int (met))).main_part_;
-      
-      audio_ = new Audio_tempo (int (r));
+      audio_ = new Audio_tempo (r.to_int ());
 
-      Audio_element_info info (audio_, tempo_req_);
+      Audio_element_info info (audio_, 0);
       announce_element (info);
-      tempo_req_ = 0;
+
+      last_tempo_ = w;
     }
 }
 
@@ -65,24 +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;
-
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req))
-    {
-      tempo_req_ = t;
-      return true;
-    }
-
-  return false;
-}
-
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"tempoWholesPerMinute ",
+		"");