X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Faudio-item.cc;h=201e8fd98e7cf4939c1de6b4a7e8ca64efc540d6;hb=9e5abb21238b21524d38e34f59fdaf42ad17b607;hp=3913527ea19cea5c5c7392e3c84940975bc8aae1;hpb=7b5a9de4af9ec29ce4e7ef3166974da1dcdfc302;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 3913527ea1..201e8fd98e 100644
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -1,9 +1,20 @@
 /*
-  audio-item.cc -- implement Audio items.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2006 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
+  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 "audio-item.hh"
@@ -28,27 +39,31 @@ Audio_item::get_column () const
 }
 
 Audio_item::Audio_item ()
+  : audio_column_ (0),
+    channel_ (0)
 {
-  audio_column_ = 0;
 }
 
 Audio_note::Audio_note (Pitch p, Moment m, bool tie_event, Pitch transposing)
+  : pitch_ (p),
+    length_mom_ (m),
+    transposing_ (transposing),
+    dynamic_ (0),
+    tied_ (0),
+    tie_event_ (tie_event)
 {
-  pitch_ = p;
-  length_mom_ = m;
-  tied_ = 0;
-  transposing_ = transposing;
-  tie_event_ = tie_event;
 }
 
 void
-Audio_note::tie_to (Audio_note *t)
+Audio_note::tie_to (Audio_note *t, Moment skip)
 {
   tied_ = t;
   Audio_note *first = t;
   while (first->tied_)
     first = first->tied_;
-  first->length_mom_ += length_mom_;
+  // Add the skip to the tied note and the length of the appended note
+  // to the full duration of the tie...
+  first->length_mom_ += skip + length_mom_;
   length_mom_ = 0;
 }
 
@@ -59,13 +74,16 @@ Audio_key::Audio_key (int acc, bool major)
 }
 
 Audio_dynamic::Audio_dynamic ()
+  : volume_ (-1),
+    silent_ (false)
 {
-  volume_ = -1;
 }
 
-Audio_span_dynamic::Audio_span_dynamic ()
+Audio_span_dynamic::Audio_span_dynamic (Real min_volume, Real max_volume)
 {
   grow_dir_ = CENTER;
+  min_volume_ = min_volume;
+  max_volume_ = max_volume;
 }
 
 void
@@ -75,58 +93,74 @@ Audio_span_dynamic::add_absolute (Audio_dynamic *d)
   dynamics_.push_back (d);
 }
 
-static Real
-moment2real (Moment m)
+Moment
+remap_grace_duration (Moment m)
+{
+  return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_,
+                 Rational (0));
+}
+
+Real
+moment_to_real (Moment m)
+{
+  return remap_grace_duration (m).main_part_.to_double ();
+}
+
+int
+moment_to_ticks (Moment m)
 {
-  return m.main_part_.to_double ()
-    + 0.1 * m.grace_part_.to_double ();
+  return int (moment_to_real (m) * 384 * 4);
 }
 
 void
 Audio_span_dynamic::render ()
 {
   if (dynamics_.size () <= 1)
-    return ;
+    return;
 
   assert (dynamics_[0]->volume_ >= 0);
 
-  if (dynamics_.back ()->volume_ > 0
-      && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
+  while (dynamics_.back ()->volume_ > 0
+         && dynamics_.size () > 1
+         && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
     {
       dynamics_.erase (dynamics_.end () - 1);
-      assert (dynamics_.back ()->volume_ < 0);
     }
 
   if (dynamics_.size () <= 1)
-    return ;
+    {
+      programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
+      return;
+    }
 
-  Real delta_v = grow_dir_ * 0.1;
-  
   Real start_v = dynamics_[0]->volume_;
   if (dynamics_.back ()->volume_ < 0)
-    dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.0);
+    {
+      // The dynamic spanner does not end with an explicit dynamic script
+      // event.  Adjust the end volume by at most 1/4 of the available
+      // volume range in this case.
+      dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * (max_volume_ - min_volume_) * 0.25, max_volume_), min_volume_);
+    }
 
-  delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
+  Real delta_v = dynamics_.back ()->volume_ - dynamics_[0]->volume_;
 
   Moment start = dynamics_[0]->get_column ()->when ();
 
-  Real total_t = moment2real (dynamics_.back ()->get_column ()->when () - start);
-  
-  for (vsize i = 1; i < dynamics_.size(); i ++)
+  Real total_t = moment_to_real (dynamics_.back ()->get_column ()->when () - start);
+
+  for (vsize i = 1; i < dynamics_.size (); i++)
     {
       Moment dt_moment = dynamics_[i]->get_column ()->when ()
-	- start;
+                         - start;
+
+      Real dt = moment_to_real (dt_moment);
 
-      Real dt =  moment2real (dt_moment);
-      
-      Real v = start_v + delta_v *  (dt / total_t);
+      Real v = start_v + delta_v * (dt / total_t);
 
-      dynamics_[i]->volume_ = v;	
+      dynamics_[i]->volume_ = v;
     }
 }
 
-
-
 Audio_tempo::Audio_tempo (int per_minute_4)
 {
   per_minute_4_ = per_minute_4;