X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fdynamic-performer.cc;h=c80d64111ee1dad5dd034b07408d6881dc757d44;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=1e538800b474c6e256b015c1e0873282a9a1cd60;hpb=6d37e68b8d93284b8ce8a17975fe3ac482a02f2d;p=lilypond.git

diff --git a/lily/dynamic-performer.cc b/lily/dynamic-performer.cc
index 1e538800b4..c80d64111e 100644
--- a/lily/dynamic-performer.cc
+++ b/lily/dynamic-performer.cc
@@ -3,22 +3,15 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-
 #include "audio-item.hh"
 #include "stream-event.hh"
-#include "translator.icc"
-
-/*
-  TODO:
 
-  handle multiple events
+#include "translator.icc"
 
-  perform absolute (text) dynamics
-*/
 class Dynamic_performer : public Performer
 {
 public:
@@ -26,87 +19,168 @@ public:
 protected:
   void stop_translation_timestep ();
   void process_music ();
+  Real equalize_volume (Real);
 
+  DECLARE_TRANSLATOR_LISTENER (decrescendo);
+  DECLARE_TRANSLATOR_LISTENER (crescendo);
   DECLARE_TRANSLATOR_LISTENER (absolute_dynamic);
 private:
   Stream_event *script_event_;
-  Audio_dynamic *audio_;
+  Drul_array<Stream_event*> span_events_; 
+  Drul_array<Direction> grow_dir_; 
+  Real last_volume_;
+  Audio_dynamic *absolute_;
+  Audio_span_dynamic *span_dynamic_;
+  Audio_span_dynamic *finished_span_dynamic_;
 };
 
 Dynamic_performer::Dynamic_performer ()
 {
+  last_volume_ = 0.5;
   script_event_ = 0;
-  audio_ = 0;
+  absolute_ = 0;
+  span_events_[LEFT] = 
+    span_events_[RIGHT] = 0;
+  span_dynamic_ = 0;
+  finished_span_dynamic_ = 0;
 }
 
-void
-Dynamic_performer::process_music ()
+Real
+Dynamic_performer::equalize_volume (Real volume)
 {
-  if (script_event_)
+  /*
+    properties override default equaliser setting
+  */
+  SCM min = get_property ("midiMinimumVolume");
+  SCM max = get_property ("midiMaximumVolume");
+  if (scm_is_number (min) || scm_is_number (max))
+    {
+      Interval iv (0, 1);
+      if (scm_is_number (min))
+	iv[MIN] = scm_to_double (min);
+      if (scm_is_number (max))
+	iv[MAX] = scm_to_double (max);
+      volume = iv[MIN] + iv.length () * volume;
+    }
+  else
     {
-      SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
+      /*
+	urg, code duplication:: staff_performer
+      */
+      SCM s = get_property ("midiInstrument");
 
-      SCM svolume = SCM_EOL;
-      if (ly_is_procedure (proc))
-	{
-	  // urg
-	  svolume = scm_call_1 (proc, script_event_->get_property ("text"));
-	}
+      if (!scm_is_string (s))
+	s = get_property ("instrumentName");
 
-      Real volume = robust_scm2double (svolume, 0.5);
+      if (!scm_is_string (s))
+	s = scm_from_locale_string ("piano");
 
-      /*
-	properties override default equaliser setting
-      */
-      SCM min = get_property ("midiMinimumVolume");
-      SCM max = get_property ("midiMaximumVolume");
-      if (scm_is_number (min) || scm_is_number (max))
+      SCM eq = get_property ("instrumentEqualizer");
+      if (ly_is_procedure (eq))
+	s = scm_call_1 (eq, s);
+
+      if (is_number_pair (s))
 	{
-	  Interval iv (0, 1);
-	  if (scm_is_number (min))
-	    iv[MIN] = scm_to_double (min);
-	  if (scm_is_number (max))
-	    iv[MAX] = scm_to_double (max);
+	  Interval iv = ly_scm2interval (s);
 	  volume = iv[MIN] + iv.length () * volume;
 	}
-      else
-	{
-	  /*
-	    urg, code duplication:: staff_performer
-	  */
-	  SCM s = get_property ("midiInstrument");
+    }
+  return volume;
+}
 
-	  if (!scm_is_string (s))
-	    s = get_property ("instrumentName");
 
-	  if (!scm_is_string (s))
-	    s = scm_makfrom0str ("piano");
+void
+Dynamic_performer::process_music ()
+{
+  if (span_events_[STOP] || script_event_)
+    {
+      finished_span_dynamic_ = span_dynamic_;
+      span_dynamic_ = 0;
+    }
 
-	  SCM eq = get_property ("instrumentEqualizer");
-	  if (ly_is_procedure (eq))
-	    s = scm_call_1 (eq, s);
+  if (span_events_[START])
+    {
+      span_dynamic_ = new Audio_span_dynamic ();
+      announce_element (Audio_element_info (span_dynamic_, span_events_[START]));
 
-	  if (is_number_pair (s))
+      span_dynamic_->grow_dir_ = grow_dir_[START];
+    }
+
+  if (script_event_
+      || span_dynamic_
+      || finished_span_dynamic_)
+    {
+      absolute_ = new Audio_dynamic ();
+
+      if (script_event_)
+	{
+	  SCM proc = get_property ("dynamicAbsoluteVolumeFunction");
+
+	  SCM svolume = SCM_EOL;
+	  if (ly_is_procedure (proc))
 	    {
-	      Interval iv = ly_scm2interval (s);
-	      volume = iv[MIN] + iv.length () * volume;
+	      // urg
+	      svolume = scm_call_1 (proc, script_event_->get_property ("text"));
 	    }
-	}
 
-      audio_ = new Audio_dynamic (volume);
-      Audio_element_info info (audio_, script_event_);
+	  Real volume = robust_scm2double (svolume, 0.5);
+
+	  last_volume_
+	    = absolute_->volume_ = equalize_volume (volume);
+	}
+      
+      Audio_element_info info (absolute_, script_event_);
       announce_element (info);
-      script_event_ = 0;
     }
+
+
+  if (span_dynamic_)
+    span_dynamic_->add_absolute (absolute_);
+
+  if (finished_span_dynamic_)
+    finished_span_dynamic_->add_absolute (absolute_);
 }
 
 void
 Dynamic_performer::stop_translation_timestep ()
 {
-  if (audio_)
+  if (finished_span_dynamic_)
     {
-      audio_ = 0;
+      finished_span_dynamic_->render ();
+      finished_span_dynamic_ = 0;
     }
+  
+  if (absolute_ && absolute_->volume_ < 0)
+    {
+      absolute_->volume_ = last_volume_;
+    }
+  else if (absolute_)
+    {
+      last_volume_ = absolute_->volume_;
+    }
+  
+  absolute_ = 0;
+  script_event_ = 0;
+  span_events_[LEFT] = 
+    span_events_[RIGHT] = 0;
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, decrescendo);
+void
+Dynamic_performer::listen_decrescendo (Stream_event *r)
+{
+  Direction d = to_dir (r->get_property ("span-direction"));
+  span_events_[d] = r;
+  grow_dir_[d] = SMALLER;
+}
+
+IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, crescendo);
+void
+Dynamic_performer::listen_crescendo (Stream_event *r)
+{
+  Direction d = to_dir (r->get_property ("span-direction"));
+  span_events_[d] = r;
+  grow_dir_[d] = BIGGER;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Dynamic_performer, absolute_dynamic);
@@ -118,8 +192,19 @@ Dynamic_performer::listen_absolute_dynamic (Stream_event *r)
 }
 
 ADD_TRANSLATOR (Dynamic_performer,
-		/* doc */ 		 "",
-		/* create */ "",
-		/* accept */ "absolute-dynamic-event",
-		/* read */ "dynamicAbsoluteVolumeFunction midiMaximumVolume midiMinimumVolume midiInstrument instrumentEqualizer",
-		/*writes*/"");
+		/* doc */
+		"",
+
+		/* create */
+		"",
+
+		/* read */
+		"dynamicAbsoluteVolumeFunction "
+		"instrumentEqualizer "
+		"midiMaximumVolume "
+		"midiMinimumVolume "
+		"midiInstrument ",
+
+		/* write */
+		""
+		);