* flower

[lilypond.git] / lily / time-signature-performer.cc

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index efab395ee2e12aa5961118af8711b436a9392abc..4b9aad5e483540773674d713b9579fe0b55f74f8 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,18 +3,16 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
 
-
 class Time_signature_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_performer);
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
   ~Time_signature_performer ();
 
 protected:
@@ -25,10 +23,9 @@ protected:
   SCM prev_fraction_;
 private:
 
-  Audio_time_signature* audio_;
+  Audio_time_signature *audio_;
 };
 
-
 Time_signature_performer::Time_signature_performer ()
 {
   prev_fraction_ = SCM_BOOL_F;
@@ -39,18 +36,17 @@ Time_signature_performer::~Time_signature_performer ()
 {
 }
 
-
 void
 Time_signature_performer::create_audio_elements ()
 {
   SCM fr = get_property ("timeSignatureFraction");
-  if (gh_pair_p (fr) && !gh_equal_p (fr, prev_fraction_))
+  if (scm_is_pair (fr) && !ly_c_equal_p (fr, prev_fraction_))
     {
       prev_fraction_ = fr;
-      int b = gh_scm2int (ly_car (fr));
-      int o = gh_scm2int (ly_cdr (fr));
-      
-      audio_ = new Audio_time_signature (b,o);
+      int b = scm_to_int (scm_car (fr));
+      int o = scm_to_int (scm_cdr (fr));
+
+      audio_ = new Audio_time_signature (b, o);
       Audio_element_info info (audio_, 0);
       announce_element (info);
 
@@ -67,4 +63,4 @@ Time_signature_performer::stop_translation_timestep ()
     }
 }
 
-ENTER_DESCRIPTION(Time_signature_performer,"","","","","","");
+ADD_TRANSLATOR (Time_signature_performer, "", "", "", "", "", "");