X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=58bc879ec13bb3619ee7007fdf89f697e376c817;hb=456d20f8f4a581e3ac77b0e1d912b90f682af08e;hp=f415317ae7fee72df7843ac3198ed67285613f54;hpb=bdf4ab13203502e7ec7cf9cf5896527643a07c1f;p=lilypond.git

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index f415317ae7..58bc879ec1 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,29 +3,31 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "context.hh"
-#include "audio-item.hh"
-#include "pqueue.hh"
 #include "performer.hh"
 
+#include "audio-item.hh"
+#include "context.hh"
+#include "stream-event.hh"
+#include "translator.icc"
+
 class Tie_performer : public Performer
 {
-  Music *event_;
-  Music *last_event_;
-  Array<Audio_element_info> now_heads_;
-  Array<Audio_element_info> heads_to_tie_;
+  Stream_event *event_;
+  vector<Audio_element_info> now_heads_;
+  vector<Audio_element_info> now_tied_heads_;
+  vector<Audio_element_info> heads_to_tie_;
 
   bool ties_created_;
 
 protected:
-  virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
+  void stop_translation_timestep ();
+  void start_translation_timestep ();
   virtual void acknowledge_audio_element (Audio_element_info);
-  virtual bool try_music (Music *);
-  virtual void process_music ();
+  void process_music ();
+  DECLARE_TRANSLATOR_LISTENER (tie);
 public:
   TRANSLATOR_DECLARATIONS (Tie_performer);
 };
@@ -33,19 +35,14 @@ public:
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
-  last_event_ = 0;
   ties_created_ = false;
 }
 
-bool
-Tie_performer::try_music (Music *mus)
+IMPLEMENT_TRANSLATOR_LISTENER (Tie_performer, tie);
+void
+Tie_performer::listen_tie (Stream_event *ev)
 {
-  if (mus->is_mus_type ("tie-event"))
-    {
-      event_ = mus;
-    }
-
-  return true;
+  event_ = ev;
 }
 
 void
@@ -60,17 +57,21 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 {
   if (Audio_note *an = dynamic_cast<Audio_note *> (inf.elem_))
     {
-      now_heads_.push (inf);
-      for (int i = heads_to_tie_.size (); i--;)
+      if (an->tie_event_)
+        now_tied_heads_.push_back (inf);
+      else
+        now_heads_.push_back (inf);
+
+      for (vsize i = heads_to_tie_.size (); i--;)
 	{
-	  Music *right_mus = inf.event_;
+	  Stream_event *right_mus = inf.event_;
 
 	  Audio_note *th = dynamic_cast<Audio_note *> (heads_to_tie_[i].elem_);
-	  Music *left_mus = heads_to_tie_[i].event_;
+	  Stream_event *left_mus = heads_to_tie_[i].event_;
 
 	  if (right_mus && left_mus
-	      && ly_c_equal_p (right_mus->get_property ("pitch"),
-			       left_mus->get_property ("pitch")))
+	      && ly_is_equal (right_mus->get_property ("pitch"),
+			      left_mus->get_property ("pitch")))
 	    {
 	      an->tie_to (th);
 	      ties_created_ = true;
@@ -92,23 +93,32 @@ Tie_performer::stop_translation_timestep ()
   if (ties_created_)
     {
       heads_to_tie_.clear ();
-      last_event_ = 0;
       ties_created_ = false;
     }
 
   if (event_)
     {
       heads_to_tie_ = now_heads_;
-      last_event_ = event_;
     }
+
+  for (vsize i = now_tied_heads_.size (); i--;)
+    heads_to_tie_.push_back (now_tied_heads_[i]);
+
   event_ = 0;
   now_heads_.clear ();
+  now_tied_heads_.clear ();
 }
 
 ADD_TRANSLATOR (Tie_performer,
-		/* descr */ "Generate ties between noteheads of equal pitch.",
-		/* creats*/ "",
-		/* accepts */ "tie-event",
-		/* acks  */ "",
-		/* reads */ "tieMelismaBusy",
-		/* write */ "");
+		/* doc */
+		"Generate ties between note heads of equal pitch.",
+
+		/* create */
+		"",
+
+		/* read */
+		"tieMelismaBusy",
+
+		/* write */
+		""
+		);