Doc: Appendix - Articulations and Ornamentation - part 2

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 81f35d70ac1a8d3c6b140840750620f9309e37ff..59ac69ac9842c895d9ceb8bd618cf0af4ffb3031 100644 (file)
--- a/lily/note-performer.cc
+++ b/lily/note-performer.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2012 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -142,12 +142,16 @@ Note_performer::listen_breathing (Stream_event *ev)
   if (ly_is_procedure (f))
     for (vsize i = 0; i < last_notes_.size (); i++)
       {
-        Audio_note *tie_head = last_notes_[i]->tie_head ();
-        //Give midi-length the available time since the note started,
-        //including rests. It returns how much is left for the note.
-        Moment available = now_mom () - tie_head->audio_column_->when ();
+        //Pass midi-length the available time since the last note started,
+        //including any intervening rests. It returns how much is left for the
+        //note.
+        Moment start = last_notes_[i]->audio_column_->when ();
+        Moment available = now_mom () - start;
         Moment len = robust_scm2moment (scm_call_2 (f, available.smobbed_copy (),
                                                     context ()->self_scm ()), available);
+        //Take time from the first note of the tie, since it has all the length.
+        Audio_note *tie_head = last_notes_[i]->tie_head ();
+        len += start - tie_head->audio_column_->when ();
         if (len < tie_head->length_mom_)
           tie_head->length_mom_ = len;
       }