]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/time-signature-performer.cc
* tex/lilyponddefs.tex (\lyitem): Don't use \topalign to make
[lilypond.git] / lily / time-signature-performer.cc
index 4aad0091e3128b5aa91890df393205cf1006ad3e..d6226e725a5e7030b07f1f0a091df286f1dacc88 100644 (file)
@@ -3,7 +3,7 @@
 
   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 "audio-item.hh"
@@ -14,7 +14,7 @@
 class Time_signature_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Time_signature_performer);
+  TRANSLATOR_DECLARATIONS (Time_signature_performer);
   ~Time_signature_performer ();
 
 protected:
@@ -44,11 +44,11 @@ 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));
+      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);
@@ -67,4 +67,4 @@ Time_signature_performer::stop_translation_timestep ()
     }
 }
 
-ENTER_DESCRIPTION (Time_signature_performer, "","","","","" );
+ENTER_DESCRIPTION (Time_signature_performer,"","","","","","");