release: 1.5.29

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

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 0f65b322b4b56f02d2375555a337e2d0d1b94975..71a20bafea9f462cc6c8e3c1ec44e1d8ef1aead1 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
@@ -14,10 +14,8 @@
 class Time_signature_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS(Translator);
-  
-  Time_signature_performer();
-  ~Time_signature_performer();
+  TRANSLATOR_DECLARATIONS(Time_signature_performer);
+  ~Time_signature_performer ();
 
 protected:
 
@@ -26,7 +24,7 @@ protected:
 
   SCM prev_fraction_;
 private:
-  Time_signature_change_req* time_signature_req_l_;
+
   Audio_time_signature* audio_p_;
 };
 
@@ -46,16 +44,16 @@ void
 Time_signature_performer::create_audio_elements ()
 {
   SCM fr = get_property ("timeSignatureFraction");
-  if (gh_pair_p (fr)
-      && scm_equal_p (fr, prev_fraction_) != SCM_BOOL_T)
+  if (gh_pair_p (fr) && !gh_equal_p (fr, prev_fraction_))
     {
-      int b = gh_scm2int (gh_car (fr));
-      int o = gh_scm2int (gh_cdr (fr));
+      prev_fraction_ = fr;
+      int b = gh_scm2int (ly_car (fr));
+      int o = gh_scm2int (ly_cdr (fr));
       
       audio_p_ = new Audio_time_signature (b,o);
       Audio_element_info info (audio_p_, 0);
       announce_element (info);
-      time_signature_req_l_ = 0;
+
     }
 }
 
@@ -68,5 +66,5 @@ Time_signature_performer::stop_translation_timestep ()
       audio_p_ = 0;
     }
 }
-ADD_THIS_TRANSLATOR (Time_signature_performer);
 
+ENTER_DESCRIPTION (Time_signature_performer, "","","","","" );