]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tie-performer.cc
remove PDF related files
[lilypond.git] / lily / tie-performer.cc
index 2f0c4ecd5e7506be79186c1dac37552b62764a8c..deba694c82ffaaddb1a68e8434f0debc7f684983 100644 (file)
@@ -3,13 +3,12 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 1998--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
 #include "context.hh"
 #include "audio-item.hh"
-#include "event.hh"
 #include "pqueue.hh"
 #include "performer.hh"
 
@@ -25,22 +24,20 @@ class Tie_performer : public Performer
 protected:
   virtual void stop_translation_timestep ();
   virtual void start_translation_timestep ();
-  virtual void acknowledge_grob (Audio_element_info);
+  virtual void acknowledge_audio_element (Audio_element_info);
   virtual bool try_music (Music*);
   virtual void process_music ();
 public:
-  TRANSLATOR_DECLARATIONS(Tie_performer);
+  TRANSLATOR_DECLARATIONS (Tie_performer);
 };
 
-
-
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
   last_event_  = 0;
+  ties_created_ = false;
 }
 
-
 bool
 Tie_performer::try_music (Music *mus)
 {
@@ -56,11 +53,11 @@ void
 Tie_performer::process_music ()
 {
   if (event_)
-    daddy_context_->set_property ("tieMelismaBusy", SCM_BOOL_T);
+    context ()->set_property ("tieMelismaBusy", SCM_BOOL_T);
 }
 
 void
-Tie_performer::acknowledge_grob (Audio_element_info inf)
+Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 {
   if (Audio_note * an = dynamic_cast<Audio_note *> (inf.elem_))
     {
@@ -73,10 +70,11 @@ Tie_performer::acknowledge_grob (Audio_element_info inf)
          Music * left_mus = heads_to_tie_[i].event_;
 
          if (right_mus && left_mus
-             && gh_equal_p (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;  
            }
        }
     }
@@ -85,8 +83,8 @@ Tie_performer::acknowledge_grob (Audio_element_info inf)
 void
 Tie_performer::start_translation_timestep ()
 {
-  daddy_context_->set_property ("tieMelismaBusy",
-                             gh_bool2scm (heads_to_tie_.size ()));
+  context ()->set_property ("tieMelismaBusy",
+                           ly_bool2scm (heads_to_tie_.size ()));
       
 }
 
@@ -97,6 +95,7 @@ Tie_performer::stop_translation_timestep ()
     {
       heads_to_tie_.clear ();
       last_event_ = 0;
+      ties_created_ = false;
     }
   
   if (event_)
@@ -108,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",