* lily/dots.cc (print): replace -

[lilypond.git] / lily / tie-performer.cc

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index cbb38819e50dd275e18cf93215dc362472af4d8b..4b627708038f7373e3410e8ae99ebeeb4a01c534 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -9,7 +9,6 @@
 
 #include "context.hh"
 #include "audio-item.hh"
-#include "event.hh"
 #include "pqueue.hh"
 #include "performer.hh"
 
@@ -32,8 +31,6 @@ public:
   TRANSLATOR_DECLARATIONS (Tie_performer);
 };
 
-
-
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
@@ -41,7 +38,6 @@ Tie_performer::Tie_performer ()
   ties_created_ = false;
 }
 
-
 bool
 Tie_performer::try_music (Music *mus)
 {
@@ -57,7 +53,7 @@ void
 Tie_performer::process_music ()
 {
   if (event_)
-    daddy_context_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
@@ -74,8 +70,8 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
          Music * left_mus = heads_to_tie_[i].event_;
 
          if (right_mus && left_mus
-             && is_equal (right_mus->get_property ("pitch"),
-                            left_mus->get_property ("pitch")))
+             && ly_c_equal_p (right_mus->get_property ("pitch"),
+                              left_mus->get_property ("pitch")))
            {
              an->tie_to (th);
              ties_created_ = true;  
@@ -87,8 +83,8 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 void
 Tie_performer::start_translation_timestep ()
 {
-  daddy_context_->set_property ("tieMelismaBusy",
-                             ly_bool2scm (heads_to_tie_.size ()));
+  context ()->set_property ("tieMelismaBusy",
+                           ly_bool2scm (heads_to_tie_.size ()));
       
 }
 
@@ -99,6 +95,7 @@ Tie_performer::stop_translation_timestep ()
     {
       heads_to_tie_.clear ();
       last_event_ = 0;
+      ties_created_ = false;
     }
   
   if (event_)
@@ -110,7 +107,7 @@ Tie_performer::stop_translation_timestep ()
   now_heads_.clear ();
 }
 
-ENTER_DESCRIPTION (Tie_performer,
+ADD_TRANSLATOR (Tie_performer,
 /* descr */       "Generate ties between noteheads of equal pitch.",
 /* creats*/       "",
 /* accepts */     "tie-event",