Merge with master

[lilypond.git] / lily / tempo-performer.cc

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 3463d3e8e4d65483e46e46ead1f4c68ced508c98..ac537891ef2c1a8b6bfecf2b2d37a87e7f267922 100644 (file)
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,71 +3,77 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "tempo-performer.hh"
-#include "command-request.hh"
+#include "performer.hh"
+
 #include "audio-item.hh"
+#include "duration.hh"
+#include "stream-event.hh"
 
-ADD_THIS_TRANSLATOR (Tempo_performer);
+#include "translator.icc"
 
-Tempo_performer::Tempo_performer ()
+class Tempo_performer : public Performer
 {
-  tempo_req_l_ = 0;
-  audio_p_ = 0;
-}
+public:
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
+  ~Tempo_performer ();
 
-Tempo_performer::~Tempo_performer ()
+protected:
+
+  virtual void derived_mark () const; 
+  void stop_translation_timestep ();
+  void process_music ();
+private:
+  Audio_tempo *audio_;
+  SCM last_tempo_; 
+};
+
+void
+Tempo_performer::derived_mark () const
 {
+  scm_gc_mark (last_tempo_);
 }
 
-void 
-Tempo_performer::do_print () const
+Tempo_performer::Tempo_performer ()
 {
-#ifndef NPRINT
-  if (tempo_req_l_)
-    tempo_req_l_->print ();
-#endif
+  last_tempo_ = SCM_EOL;
+  audio_ = 0;
 }
 
-void
-Tempo_performer::do_process_requests ()
+Tempo_performer::~Tempo_performer ()
 {
-  if (tempo_req_l_)
-    {
-      audio_p_ = new Audio_tempo (tempo_req_l_->dur_.length_mom () /
-                                 Moment (1, 4) 
-                                 * Moment(tempo_req_l_->metronome_i_));
-      Audio_element_info info (audio_p_, tempo_req_l_);
-      announce_element (info);
-      tempo_req_l_ = 0;
-    }
 }
 
 void
-Tempo_performer::do_pre_move_processing ()
+Tempo_performer::process_music ()
 {
-  if (audio_p_)
+  SCM w = get_property ("tempoWholesPerMinute");
+  if (unsmob_moment (w)
+      && !ly_is_equal (w, last_tempo_))
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      Rational r = unsmob_moment (w)->main_part_;
+      r *= Rational (4, 1);
+
+      audio_ = new Audio_tempo (r.to_int ());
+
+      Audio_element_info info (audio_, 0);
+      announce_element (info);
+
+      last_tempo_ = w;
     }
 }
 
-bool
-Tempo_performer::do_try_music (Music* req_l)
+void
+Tempo_performer::stop_translation_timestep ()
 {
-  if (tempo_req_l_)
-    return false;
-
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req_l))
+  if (audio_)
     {
-      tempo_req_l_ = t;
-      return true;
+      audio_ = 0;
     }
-
-  return false;
 }
 
+ADD_TRANSLATOR (Tempo_performer, "", "",
+               "tempoWholesPerMinute ",
+               "");