X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftime-signature-performer.cc;h=3d348931a49d02288651aa71445ddd864be00055;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=d1f3599d78d214f5b94daa36bc0cfa01503bb110;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index d1f3599d78..3d348931a4 100644
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,70 +3,83 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
-
+#include "protected-scm.hh"
 
 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:
 
-  virtual void stop_translation_timestep ();
-  virtual void create_audio_elements ();
-
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void derived_mark () const;
   SCM prev_fraction_;
 private:
-  Time_signature_change_req* time_signature_req_l_;
-  Audio_time_signature* audio_p_;
+
+  Audio_time_signature *audio_;
 };
 
+void
+Time_signature_performer::derived_mark () const
+{
+  scm_gc_mark (prev_fraction_);
+}
 
 Time_signature_performer::Time_signature_performer ()
 {
   prev_fraction_ = SCM_BOOL_F;
-  audio_p_ = 0;
+  audio_ = 0;
 }
 
 Time_signature_performer::~Time_signature_performer ()
 {
 }
 
-
 void
-Time_signature_performer::create_audio_elements ()
+Time_signature_performer::process_music ()
 {
   SCM fr = get_property ("timeSignatureFraction");
-  if (gh_pair_p (fr)
-      && scm_equal_p (fr, prev_fraction_) != SCM_BOOL_T)
+  if (scm_is_pair (fr) && !ly_is_equal (fr, prev_fraction_))
     {
-      int b = gh_scm2int (gh_car (fr));
-      int o = gh_scm2int (gh_cdr (fr));
-      
-      audio_p_ = new Audio_time_signature (b,o);
-      Audio_element_info info (audio_p_, 0);
+      prev_fraction_ = fr;
+      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);
-      time_signature_req_l_ = 0;
     }
 }
 
 void
 Time_signature_performer::stop_translation_timestep ()
 {
-  if (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      audio_ = 0;
     }
 }
-ADD_THIS_TRANSLATOR (Time_signature_performer);
 
+#include "translator.icc"
+
+ADD_TRANSLATOR (Time_signature_performer,
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"",
+
+		/* write */
+		""
+		);