* lily/slur-scoring.cc (move_away_from_staffline): robustness,

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

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index c27006c3fd58c8a70a3ab6bc8d26b155684fd68c..397b3cf653be7444b5e30347c2b53139d6c66e91 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -3,13 +3,12 @@
 
   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"
-
+#include "protected-scm.hh"
 
 class Time_signature_performer : public Performer
 {
@@ -21,13 +20,18 @@ protected:
 
   virtual void stop_translation_timestep ();
   virtual void create_audio_elements ();
-
+  virtual void derived_mark () const;
   SCM prev_fraction_;
 private:
 
-  Audio_time_signature* audio_;
+  Audio_time_signature *audio_;
 };
 
+void
+Time_signature_performer::derived_mark () const
+{
+  scm_gc_mark (prev_fraction_);
+}
 
 Time_signature_performer::Time_signature_performer ()
 {
@@ -39,7 +43,6 @@ Time_signature_performer::~Time_signature_performer ()
 {
 }
 
-
 void
 Time_signature_performer::create_audio_elements ()
 {
@@ -47,13 +50,12 @@ Time_signature_performer::create_audio_elements ()
   if (scm_is_pair (fr) && !ly_c_equal_p (fr, prev_fraction_))
     {
       prev_fraction_ = fr;
-      int b = scm_to_int (ly_car (fr));
-      int o = scm_to_int (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 +69,4 @@ Time_signature_performer::stop_translation_timestep ()
     }
 }
 
-ENTER_DESCRIPTION (Time_signature_performer,"","","","","","");
+ADD_TRANSLATOR (Time_signature_performer, "", "", "", "", "", "");