The grand \paper -> \layout, \bookpaper -> \paper renaming.

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

diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc
index 682a6869d4824f211ee99fb8687a6a5d592f4762..53943e809f5511db1e7491302fa1cd152d11c502 100644 (file)
--- a/lily/tempo-performer.cc
+++ b/lily/tempo-performer.cc
@@ -3,17 +3,17 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "command-request.hh"
+
 #include "audio-item.hh"
 #include "performer.hh"
 
 class Tempo_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Tempo_performer);
+  TRANSLATOR_DECLARATIONS (Tempo_performer);
   ~Tempo_performer ();
 
 protected:
@@ -23,15 +23,10 @@ protected:
   virtual void create_audio_elements ();
 
 private:
-  Tempo_req* tempo_req_;
+  Music* tempo_req_;
   Audio_tempo* audio_;
 };
 
-ENTER_DESCRIPTION (Tempo_performer, "","",
-                  "general-music",
-                  "","","" );
-
-
 Tempo_performer::Tempo_performer ()
 {
   tempo_req_ = 0;
@@ -49,10 +44,10 @@ Tempo_performer::create_audio_elements ()
   if (tempo_req_)
     {
 
-      SCM met = tempo_req_->get_mus_property ("metronome-count");
-      Duration *d = unsmob_duration (tempo_req_->get_mus_property ("duration"));
+      SCM met = tempo_req_->get_property ("metronome-count");
+      Duration *d = unsmob_duration (tempo_req_->get_property ("tempo-unit"));
       
-      Rational r =  (d->length_mom () / Moment (Rational (1, 4)) * Moment (gh_scm2int (met))).main_part_;
+      Rational r =  (d->get_length () / Moment (Rational (1, 4)) * Moment (scm_to_int (met))).main_part_;
       
       audio_ = new Audio_tempo (int (r));
 
@@ -78,13 +73,13 @@ Tempo_performer::try_music (Music* req)
   if (tempo_req_)
     return false;
 
-  if (Tempo_req *t =
-      dynamic_cast <Tempo_req *> (req))
-    {
-      tempo_req_ = t;
+      tempo_req_ = req;
       return true;
-    }
-
-  return false;
 }
 
+
+
+
+ENTER_DESCRIPTION (Tempo_performer, "","",
+                  "metronome-change-event",
+                  "","","" );