patch::: 1.3.36.jcn4

[lilypond.git] / lily / span-dynamic-performer.cc

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index b4807e3a9d9324f2cb8397b02f492af7376437eb..0b7771e1e0e9cd317ddade202a970cfffaed3548 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -72,10 +72,10 @@ void
 Span_dynamic_performer::do_process_music ()
 {
   if (finished_dynamic_tuple_arr_.size () > 1
-     && finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_)
+     && finished_dynamic_tuple_arr_.top ().audio_l_->volume_)
     {
-      Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_i_;
-      Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_
+      Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_;
+      Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_
        - start_volume;
       /*
        urg.
@@ -90,11 +90,11 @@ Span_dynamic_performer::do_process_music ()
        */
       if (!dv || sign (dv) != finished_dir_)
        {
-         // urg.  about one volume step
-         dv = (int)finished_dir_ * 13;
+         // urg.  10%: about one volume step
+         dv = (Real)finished_dir_ * 0.1;
          if (!start_volume)
            start_volume = finished_dynamic_tuple_arr_.top
-             ().audio_l_->volume_i_ - dv;
+             ().audio_l_->volume_ - dv;
        }
       Moment start_mom = finished_dynamic_tuple_arr_[0].mom_;
       Moment dt = finished_dynamic_tuple_arr_.top ().mom_ - start_mom;
@@ -103,7 +103,7 @@ Span_dynamic_performer::do_process_music ()
          Audio_dynamic_tuple* a = &finished_dynamic_tuple_arr_[i];
          Real volume = start_volume + dv * (Real)(a->mom_ - start_mom)
            / (Real)dt;
-         a->audio_l_->volume_i_ = (int)volume;
+         a->audio_l_->volume_ = volume;
        }
       finished_dynamic_tuple_arr_.clear ();
     }