X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=b351a576252761a27f73ac45fb9e6bc70f962417;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=4a3b9d4a41d3405d2de8e9c28f205bf23a726661;hpb=af770f3440264c18ce01525dce1aa76b86ace0d5;p=lilypond.git

diff --git a/lily/audio-item.cc b/lily/audio-item.cc
index 4a3b9d4a41..b351a57625 100644
--- 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"
@@ -16,6 +16,17 @@ Audio_instrument::Audio_instrument (string instrument_string)
   str_ = instrument_string;
 }
 
+void
+Audio_item::render ()
+{
+}
+
+Audio_column *
+Audio_item::get_column () const
+{
+  return audio_column_;
+}
+
 Audio_item::Audio_item ()
 {
   audio_column_ = 0;
@@ -47,11 +58,90 @@ Audio_key::Audio_key (int acc, bool major)
   major_ = major;
 }
 
-Audio_dynamic::Audio_dynamic (Real volume)
+Audio_dynamic::Audio_dynamic ()
+{
+  volume_ = -1;
+}
+
+Audio_span_dynamic::Audio_span_dynamic ()
 {
-  volume_ = volume;
+  grow_dir_ = CENTER;
 }
 
+void
+Audio_span_dynamic::add_absolute (Audio_dynamic *d)
+{
+  assert (d);
+  dynamics_.push_back (d);
+}
+
+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 int (moment_to_real (m) * 384 * 4);
+}
+
+void
+Audio_span_dynamic::render ()
+{
+  if (dynamics_.size () <= 1)
+    return ;
+
+  assert (dynamics_[0]->volume_ >= 0);
+
+  while  (dynamics_.back ()->volume_ > 0
+	  && dynamics_.size () > 1
+	  && sign (dynamics_.back ()->volume_ - dynamics_[0]->volume_) != grow_dir_)
+    {
+      dynamics_.erase (dynamics_.end () - 1);
+    }
+
+  if (dynamics_.size () <= 1)
+    {
+      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.1);
+
+  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 ++)
+    {
+      Moment dt_moment = dynamics_[i]->get_column ()->when ()
+	- start;
+
+      Real dt =  moment_to_real (dt_moment);
+      
+      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;