X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftempo-performer.cc;h=e21f617b60f94a5e27e48152452a5a5fdafebae3;hb=17931f91895418aba963945400a613e9ee089e4b;hp=5a4a614d638020c4ece5f8cdefa97c09b6ffb4e2;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 5a4a614d63..e21f617b60 100644
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,33 +3,36 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
+#include "performer.hh"
 
 #include "audio-item.hh"
-#include "performer.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 ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (metronome_change);
 private:
-Music* tempo_req_;
-  Audio_tempo* audio_;
+  Stream_event *tempo_event_;
+  Audio_tempo *audio_;
 };
 
 Tempo_performer::Tempo_performer ()
 {
-  tempo_req_ = 0;
+  tempo_event_ = 0;
   audio_ = 0;
 }
 
@@ -37,23 +40,21 @@ Tempo_performer::~Tempo_performer ()
 {
 }
 
-
 void
-Tempo_performer::create_audio_elements ()
+Tempo_performer::process_music ()
 {
-  if (tempo_req_)
+  if (tempo_event_)
     {
+      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_;
 
-      SCM met = tempo_req_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_->get_mus_property ("tempo-unit"));
-      
-      Rational r =  (d->get_length () / 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_, tempo_event_);
       announce_element (info);
-      tempo_req_ = 0;
+      tempo_event_ = 0;
     }
 }
 
@@ -67,19 +68,13 @@ Tempo_performer::stop_translation_timestep ()
     }
 }
 
-bool
-Tempo_performer::try_music (Music* req)
+IMPLEMENT_TRANSLATOR_LISTENER (Tempo_performer, metronome_change);
+void
+Tempo_performer::listen_metronome_change (Stream_event *event)
 {
-  if (tempo_req_)
-    return false;
-
-      tempo_req_ = req;
-      return true;
+  tempo_event_ = event;
 }
 
-
-
-
-ENTER_DESCRIPTION (Tempo_performer, "","",
-		   "metronome-change-event",
-		   "","","" );
+ADD_TRANSLATOR (Tempo_performer, "", "",
+		"metronome-change-event",
+		"", "");