X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-item.cc;h=0ed413bf6796a858656a9ff318e14c4c9e99584a;hb=7a2766a80beb907df0b291584c1a84b6b4fe4c4f;hp=fb1976d561d75471ee4a2a20c97e9af087baa795;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/lily/audio-item.cc b/lily/audio-item.cc index fb1976d561..0ed413bf67 100644 --- 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--2010 Jan Nieuwenhuizen + Copyright (C) 1997--2011 Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -124,12 +124,12 @@ Audio_span_dynamic::render () if (dynamics_.size () <= 1) { - programming_error ("(de)crescendo on items with specified volume."); + 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.1); @@ -139,17 +139,17 @@ Audio_span_dynamic::render () 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; + dynamics_[i]->volume_ = v; } }