Run grand replace for 2015.

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

diff --git a/lily/note-performer.cc b/lily/note-performer.cc
index 771b52a9e0e131a2432311f5bb85f151bb553451..1ddbb13ca3daf670056457ecd7ce54826cdc5e2c 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--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2015 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
@@ -54,15 +54,15 @@ Note_performer::process_music ()
 
   Pitch transposing;
   SCM prop = get_property ("instrumentTransposition");
-  if (unsmob_pitch (prop))
-    transposing = *unsmob_pitch (prop);
+  if (Pitch::is_smob (prop))
+    transposing = *Pitch::unsmob (prop);
 
   for (vsize i = 0; i < note_evs_.size (); i++)
     {
       Stream_event *n = note_evs_[i];
       SCM pit = n->get_property ("pitch");
 
-      if (Pitch *pitp = unsmob_pitch (pit))
+      if (Pitch *pitp = Pitch::unsmob (pit))
         {
           SCM articulations = n->get_property ("articulations");
           Stream_event *tie_event = 0;
@@ -70,7 +70,7 @@ Note_performer::process_music ()
           int velocity = 0;
           for (SCM s = articulations; scm_is_pair (s); s = scm_cdr (s))
             {
-              Stream_event *ev = unsmob_stream_event (scm_car (s));
+              Stream_event *ev = Stream_event::unsmob (scm_car (s));
               if (!ev)
                 continue;
 
@@ -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;
       }