X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ftie-performer.cc;h=5d237c1de3de1e3c345613518c840c6df6ede6d2;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=9f6ae786696234f72e85bd004ded06c1bfbfe8d4;hpb=7f3f0083f89d87c5ed0422858e9648fc759e98a4;p=lilypond.git

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 9f6ae78669..5d237c1de3 100644
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -1,9 +1,20 @@
 /*
-  tie-performer.cc -- implement Tie_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1998--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1998--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "performer.hh"
@@ -12,15 +23,29 @@
 #include "context.hh"
 #include "stream-event.hh"
 #include "translator.icc"
+#include <list>
+
+struct Head_audio_event_tuple
+{
+  Audio_element_info head_;
+  // The end moment of the note, so we can calculate a skip and check whether
+  // the note still goes on
+  Moment end_moment_;
+  Head_audio_event_tuple () {}
+  Head_audio_event_tuple (Audio_element_info h, Moment m)
+  {
+    head_ = h;
+    end_moment_ = m;
+  }
+};
+
 
 class Tie_performer : public Performer
 {
   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_;
+  list<Head_audio_event_tuple> now_heads_;
+  list<Head_audio_event_tuple> now_tied_heads_; // new tied notes
+  list<Head_audio_event_tuple> heads_to_tie_; // heads waiting for closing tie
 
 protected:
   void stop_translation_timestep ();
@@ -35,7 +60,6 @@ public:
 Tie_performer::Tie_performer ()
 {
   event_ = 0;
-  ties_created_ = false;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Tie_performer, tie);
@@ -57,24 +81,38 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 {
   if (Audio_note *an = dynamic_cast<Audio_note *> (inf.elem_))
     {
+      // for each tied note, store the info and its end moment, so we can
+      // later on check whether (1) the note is still ongoing and (2) how
+      // long the skip is with tieWaitForNote
+      Head_audio_event_tuple inf_mom (inf, now_mom () + an->length_mom_);
       if (an->tie_event_)
-        now_tied_heads_.push_back (inf);
+        now_tied_heads_.push_back (inf_mom);
       else
-        now_heads_.push_back (inf);
-
-      for (vsize i = heads_to_tie_.size (); i--;)
+        now_heads_.push_back (inf_mom);
+
+      // Find a previous note that ties to the current note. If it exists, 
+      // remove it from the heads_to_tie vector and create the tie
+      list<Head_audio_event_tuple>::iterator it;
+      bool found = false;
+      Stream_event *right_mus = inf.event_;
+        for (it = heads_to_tie_.begin ();
+             !found && (it != heads_to_tie_.end());
+             it++)
 	{
-	  Stream_event *right_mus = inf.event_;
+	  Audio_element_info et = (*it).head_;
+	  Audio_note *th = dynamic_cast<Audio_note *> (et.elem_);
+	  Stream_event *left_mus = et.event_;
 
-	  Audio_note *th = dynamic_cast<Audio_note *> (heads_to_tie_[i].elem_);
-	  Stream_event *left_mus = heads_to_tie_[i].event_;
-
-	  if (right_mus && left_mus
+	  if (th && right_mus && left_mus
 	      && ly_is_equal (right_mus->get_property ("pitch"),
 			      left_mus->get_property ("pitch")))
 	    {
-	      an->tie_to (th);
-	      ties_created_ = true;
+	      found = true;
+	      // (*it).moment_ already stores the end of the tied note!
+	      Moment skip = now_mom() - (*it).end_moment_;
+	      an->tie_to (th, skip);
+	      // this invalidates the iterator, we are leaving the loop anyway
+	      heads_to_tie_.erase (it);
 	    }
 	}
     }
@@ -87,22 +125,35 @@ Tie_performer::start_translation_timestep ()
 			    ly_bool2scm (heads_to_tie_.size ()));
 }
 
+// a predicate implemented as a class, used to delete all tied notes with end
+// moment in the past:
+class end_moment_passed
+{
+protected:
+  Moment now;
+public:
+  end_moment_passed (Moment mom) : now (mom) {}
+  bool operator() (const Head_audio_event_tuple &value) {
+    return (value.end_moment_ <= now);
+  }
+};
+
 void
 Tie_performer::stop_translation_timestep ()
 {
-  if (ties_created_)
+  // We might have dangling open ties like c~ d. Close them, unless the first
+  // note is still ongoing or we have we have tieWaitForNote set...
+  if (!to_boolean (get_property ("tieWaitForNote")))
     {
-      heads_to_tie_.clear ();
-      ties_created_ = false;
+      heads_to_tie_.remove_if (end_moment_passed (now_mom ()));
     }
 
+  // Append now_heads_ and now_tied_heads to heads_to_tie_ for the next time step
   if (event_)
     {
-      heads_to_tie_ = now_heads_;
+      heads_to_tie_.splice (heads_to_tie_.end (), now_heads_);
     }
-
-  for (vsize i = now_tied_heads_.size (); i--;)
-    heads_to_tie_.push_back (now_tied_heads_[i]);
+  heads_to_tie_.splice (heads_to_tie_.end (), now_tied_heads_);
 
   event_ = 0;
   now_heads_.clear ();
@@ -117,8 +168,8 @@ ADD_TRANSLATOR (Tie_performer,
 		"",
 
 		/* read */
-		"tieMelismaBusy",
+		"tieWaitForNote",
 
 		/* write */
-		""
+		"tieMelismaBusy"
 		);