X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-performer.cc;h=978a8d2a6e1e768bfb3995a273a32647b7c554b3;hb=4b4331d24c2c39592f2da381156da92d140c9419;hp=e5a7f20069847c3f09b5127640ff7b8beb2b9ef1;hpb=fcc5f76615e024803904a055902fdc6a3b24dccb;p=lilypond.git

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index e5a7f20069..978a8d2a6e 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -1,9 +1,20 @@
 /*
-  dynamic-performer.cc -- implement Dynamic_performer
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2012 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2000--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "performer.hh"
@@ -26,8 +37,8 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
 private:
   Stream_event *script_event_;
-  Drul_array<Stream_event*> span_events_; 
-  Drul_array<Direction> grow_dir_; 
+  Drul_array<Stream_event *> span_events_;
+  Drul_array<Direction> grow_dir_;
   Real last_volume_;
   Audio_dynamic *absolute_;
   Audio_span_dynamic *span_dynamic_;
@@ -39,8 +50,8 @@ Dynamic_performer::Dynamic_performer ()
   last_volume_ = 0.5;
   script_event_ = 0;
   absolute_ = 0;
-  span_events_[LEFT] = 
-    span_events_[RIGHT] = 0;
+  span_events_[LEFT]
+    = span_events_[RIGHT] = 0;
   span_dynamic_ = 0;
   finished_span_dynamic_ = 0;
 }
@@ -57,38 +68,37 @@ Dynamic_performer::equalize_volume (Real volume)
     {
       Interval iv (0, 1);
       if (scm_is_number (min))
-	iv[MIN] = scm_to_double (min);
+        iv[MIN] = scm_to_double (min);
       if (scm_is_number (max))
-	iv[MAX] = scm_to_double (max);
+        iv[MAX] = scm_to_double (max);
       volume = iv[MIN] + iv.length () * volume;
     }
   else
     {
       /*
-	urg, code duplication:: staff_performer
+        urg, code duplication:: staff_performer
       */
       SCM s = get_property ("midiInstrument");
 
       if (!scm_is_string (s))
-	s = get_property ("instrumentName");
+        s = get_property ("instrumentName");
 
       if (!scm_is_string (s))
-	s = scm_from_locale_string ("piano");
+        s = scm_from_locale_string ("piano");
 
       SCM eq = get_property ("instrumentEqualizer");
       if (ly_is_procedure (eq))
-	s = scm_call_1 (eq, s);
+        s = scm_call_1 (eq, s);
 
       if (is_number_pair (s))
-	{
-	  Interval iv = ly_scm2interval (s);
-	  volume = iv[MIN] + iv.length () * volume;
-	}
+        {
+          Interval iv = ly_scm2interval (s);
+          volume = iv[MIN] + iv.length () * volume;
+        }
     }
   return volume;
 }
 
-
 void
 Dynamic_performer::process_music ()
 {
@@ -100,7 +110,7 @@ Dynamic_performer::process_music ()
 
   if (span_events_[START])
     {
-      span_dynamic_ = new Audio_span_dynamic ();
+      span_dynamic_ = new Audio_span_dynamic (equalize_volume (0.1), equalize_volume (1.0));
       announce_element (Audio_element_info (span_dynamic_, span_events_[START]));
 
       span_dynamic_->grow_dir_ = grow_dir_[START];
@@ -113,27 +123,26 @@ Dynamic_performer::process_music ()
       absolute_ = new Audio_dynamic ();
 
       if (script_event_)
-	{
-	  SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
-
-	  SCM svolume = SCM_EOL;
-	  if (ly_is_procedure (proc))
-	    {
-	      // urg
-	      svolume = scm_call_1 (proc, script_event_->get_property ("text"));
-	    }
-
-	  Real volume = robust_scm2double (svolume, 0.5);
-
-	  last_volume_
-	    = absolute_->volume_ = equalize_volume (volume);
-	}
-      
+        {
+          SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
+
+          SCM svolume = SCM_EOL;
+          if (ly_is_procedure (proc))
+            {
+              // urg
+              svolume = scm_call_1 (proc, script_event_->get_property ("text"));
+            }
+
+          Real volume = robust_scm2double (svolume, 0.5);
+
+          last_volume_
+            = absolute_->volume_ = equalize_volume (volume);
+        }
+
       Audio_element_info info (absolute_, script_event_);
       announce_element (info);
     }
 
-
   if (span_dynamic_)
     span_dynamic_->add_absolute (absolute_);
 
@@ -149,7 +158,7 @@ Dynamic_performer::stop_translation_timestep ()
       finished_span_dynamic_->render ();
       finished_span_dynamic_ = 0;
     }
-  
+
   if (absolute_ && absolute_->volume_ < 0)
     {
       absolute_->volume_ = last_volume_;
@@ -158,11 +167,11 @@ Dynamic_performer::stop_translation_timestep ()
     {
       last_volume_ = absolute_->volume_;
     }
-  
+
   absolute_ = 0;
   script_event_ = 0;
-  span_events_[LEFT] = 
-    span_events_[RIGHT] = 0;
+  span_events_[LEFT]
+    = span_events_[RIGHT] = 0;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, decrescendo);
@@ -192,19 +201,19 @@ Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
 }
 
 ADD_TRANSLATOR (Dynamic_performer,
-		/* doc */
-		"",
-
-		/* create */
-		"",
-
-		/* read */
-		"dynamicAbsoluteVolumeFunction "
-		"instrumentEqualizer "
-		"midiMaximumVolume "
-		"midiMinimumVolume "
-		"midiInstrument ",
-
-		/* write */
-		""
-		);
+                /* doc */
+                "",
+
+                /* create */
+                "",
+
+                /* read */
+                "dynamicAbsoluteVolumeFunction "
+                "instrumentEqualizer "
+                "midiMaximumVolume "
+                "midiMinimumVolume "
+                "midiInstrument ",
+
+                /* write */
+                ""
+               );