From 1243869da8181ba48ef239aab1a2da598b5081a9 Mon Sep 17 00:00:00 2001 From: Mark Polesky Date: Sun, 21 Nov 2010 06:56:55 -0800 Subject: [PATCH] Better wording for "specified volume" error. --- lily/audio-item.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lily/audio-item.cc b/lily/audio-item.cc index 56569bde4e..0ed413bf67 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -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; } } -- 2.39.2