Imported Upstream version 2.16.0

[lilypond.git] / lily / audio-item.cc

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 76a3923848b5d853cca02f41c6417f24b368b0a4..201e8fd98e7cf4939c1de6b4a7e8ca64efc540d6 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2012 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
@@ -39,18 +39,18 @@ Audio_item::get_column () const
 }
 
 Audio_item::Audio_item ()
-  : audio_column_ (0)
-  , channel_ (0)
+  : audio_column_ (0),
+    channel_ (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),
+    transposing_ (transposing),
+    dynamic_ (0),
+    tied_ (0),
+    tie_event_ (tie_event)
 {
 }
 
@@ -74,14 +74,16 @@ Audio_key::Audio_key (int acc, bool major)
 }
 
 Audio_dynamic::Audio_dynamic ()
-  : volume_ (-1)
-  , silent_ (false)
+  : volume_ (-1),
+    silent_ (false)
 {
 }
 
-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
@@ -94,8 +96,8 @@ Audio_span_dynamic::add_absolute (Audio_dynamic *d)
 Moment
 remap_grace_duration (Moment m)
 {
-  return Moment (m.main_part_ + Rational (9,40) * m.grace_part_,
-                Rational (0));
+  return Moment (m.main_part_ + Rational (9, 40) * m.grace_part_,
+                 Rational (0));
 }
 
 Real
@@ -114,13 +116,13 @@ void
 Audio_span_dynamic::render ()
 {
   if (dynamics_.size () <= 1)
-    return ;
+    return;
 
   assert (dynamics_[0]->volume_ >= 0);
 
-  while  (dynamics_.back ()->volume_ > 0
-         && dynamics_.size () > 1
-         && 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);
     }
@@ -128,36 +130,37 @@ Audio_span_dynamic::render ()
   if (dynamics_.size () <= 1)
     {
       programming_error ("Impossible or ambiguous (de)crescendo in MIDI.");
-      return ;
+      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.1);
+    {
+      // 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 = moment_to_real (dynamics_.back ()->get_column ()->when () - start);
 
-  for (vsize i = 1; i < dynamics_.size (); i ++)
+  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 = moment_to_real (dt_moment);
 
-      Real v = start_v + delta_v *  (dt / total_t);
+      Real v = start_v + delta_v * (dt / total_t);
 
       dynamics_[i]->volume_ = v;
     }
 }
 
-
-
 Audio_tempo::Audio_tempo (int per_minute_4)
 {
   per_minute_4_ = per_minute_4;