Run `make grand-replace'.

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

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 3913527ea19cea5c5c7392e3c84940975bc8aae1..b351a576252761a27f73ac45fb9e6bc70f962417 100644 (file)
--- a/lily/audio-item.cc
+++ b/lily/audio-item.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "audio-item.hh"
@@ -75,11 +75,23 @@ Audio_span_dynamic::add_absolute (Audio_dynamic *d)
   dynamics_.push_back (d);
 }
 
-static Real
-moment2real (Moment m)
+Moment
+remap_grace_duration (Moment m)
 {
-  return m.main_part_.to_double ()
-    + 0.1 * m.grace_part_.to_double ();
+  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 int (moment_to_real (m) * 384 * 4);
 }
 
 void
@@ -90,34 +102,37 @@ Audio_span_dynamic::render ()
 
   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 ("(de)crescendo on items with specified volume.");
+      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);
+    dynamics_.back ()->volume_ = max (min (start_v + grow_dir_ * 0.25, 1.0), 0.1);
 
   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);
+  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;
 
-      Real dt =  moment2real (dt_moment);
+      Real dt =  moment_to_real (dt_moment);
       
       Real v = start_v + delta_v *  (dt / total_t);