* tex/GNUmakefile ($(outdir)/latin1.enc): Replace `/minus' with

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

diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc
index 46e42cb8b57f55449d72f2d54c24e0262269094b..3988db8c23d85a45e2c49aff4b439e99173e3879 100644 (file)
--- a/lily/time-signature-performer.cc
+++ b/lily/time-signature-performer.cc
@@ -7,10 +7,8 @@
 */
 
 #include "audio-item.hh"
-#include "lily-proto.hh"
 #include "performer.hh"
 
-
 class Time_signature_performer : public Performer
 {
 public:
@@ -44,11 +42,11 @@ void
 Time_signature_performer::create_audio_elements ()
 {
   SCM fr = get_property ("timeSignatureFraction");
-  if (is_pair (fr) && !is_equal (fr, prev_fraction_))
+  if (scm_is_pair (fr) && !ly_c_equal_p (fr, prev_fraction_))
     {
       prev_fraction_ = fr;
-      int b = ly_scm2int (ly_car (fr));
-      int o = ly_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);