X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-dynamic-performer.cc;h=28e2ea675dc02db45cd1eae079c9ed2cf4da53bd;hb=04985a5e47a1d94cf38bfbefbdbf92b2a85bfed9;hp=b4807e3a9d9324f2cb8397b02f492af7376437eb;hpb=ee513a2f7d18fc8d43e1c291350ed81856b0192d;p=lilypond.git

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index b4807e3a9d..28e2ea675d 100644
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -3,170 +3,184 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
 #include "audio-item.hh"
+#include "international.hh"
+#include "stream-event.hh"
+
+#include "translator.icc"
 
+/*
+  TODO: fold this into 1 engraver: \< and \> should also stop when
+  absdyn is encountered.
+*/
 struct Audio_dynamic_tuple
 {
-  Audio_dynamic* audio_l_;
+  Audio_dynamic *audio_;
   Moment mom_;
 };
 
 /**
    perform span-dynamics
- */
+*/
 class Span_dynamic_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Span_dynamic_performer ();
+  TRANSLATOR_DECLARATIONS (Span_dynamic_performer);
 
 protected:
-  virtual bool do_try_music (Music* req_l);
-  virtual void acknowledge_element (Audio_element_info);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
+  virtual void acknowledge_audio_element (Audio_element_info);
+  void process_music ();
+  void stop_translation_timestep ();
 
+  DECLARE_TRANSLATOR_LISTENER (decrescendo);
+  DECLARE_TRANSLATOR_LISTENER (crescendo);
 private:
-  Audio_dynamic* audio_p_;
-  Span_req* span_start_req_l_;
-  Drul_array<Span_req*> span_req_l_drul_;
-  Array<Audio_dynamic_tuple> dynamic_tuple_arr_;
-  Array<Audio_dynamic_tuple> finished_dynamic_tuple_arr_;
+  Audio_dynamic *audio_;
+  Real last_volume_;
+  Stream_event *span_start_event_;
+  Drul_array<Stream_event *> span_events_;
+  vector<Audio_dynamic_tuple> dynamic_tuples_;
+  vector<Audio_dynamic_tuple> finished_dynamic_tuples_;
   Direction dir_;
   Direction finished_dir_;
 };
 
-ADD_THIS_TRANSLATOR (Span_dynamic_performer);
-
 Span_dynamic_performer::Span_dynamic_performer ()
 {
-  span_req_l_drul_[START] = 0;
-  span_req_l_drul_[STOP] = 0;
-  span_start_req_l_ = 0;
-  audio_p_ = 0;
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
+  span_start_event_ = 0;
+  audio_ = 0;
+  last_volume_ = 0;
 }
 
 void
-Span_dynamic_performer::acknowledge_element (Audio_element_info i)
+Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i)
 {
-  if (Audio_dynamic * d = dynamic_cast <Audio_dynamic*> (i.elem_l_))
+  if (Audio_dynamic *d = dynamic_cast<Audio_dynamic *> (i.elem_))
+    last_volume_ = d->volume_;
+}
+
+void
+Span_dynamic_performer::process_music ()
+{
+  if (span_start_event_ || span_events_[START])
     {
-      Audio_dynamic_tuple a = { d, now_mom () };
-      if (!span_req_l_drul_[START])
-	dynamic_tuple_arr_.clear ();
-      dynamic_tuple_arr_.push (a);
-      if (finished_dynamic_tuple_arr_.size ())
-	finished_dynamic_tuple_arr_.push (a);
+      audio_ = new Audio_dynamic (0);
+      Audio_element_info info (audio_, span_events_[START]
+			       ? span_events_[START]
+			       : span_events_[STOP]);
+      announce_element (info);
+      Audio_dynamic_tuple a = { audio_, now_mom () };
+      dynamic_tuples_.push_back (a);
     }
+
+  if (span_events_[STOP])
+    {
+      if (!span_start_event_)
+	{
+	  span_events_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+	  span_events_[STOP] = 0;
+	}
+      else
+	{
+	  finished_dir_ = dir_;
+	  finished_dynamic_tuples_ = dynamic_tuples_;
+	}
+      dynamic_tuples_.clear ();
+      span_start_event_ = 0;
+    }
+
+  if (span_events_[START])
+    {
+      dir_ = (span_events_[START]->in_event_class ("crescendo-event"))
+	? RIGHT : LEFT;
+      span_start_event_ = span_events_[START];
+
+      dynamic_tuples_.clear ();
+      Audio_dynamic_tuple a = { audio_, now_mom () };
+      dynamic_tuples_.push_back (a);
+    }
+
+  if (span_events_[STOP])
+    finished_dynamic_tuples_.back ().audio_->volume_ = last_volume_;
+
+  if (span_events_[START])
+    dynamic_tuples_[0].audio_->volume_ = last_volume_;
+
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
 }
 
 void
-Span_dynamic_performer::do_process_music ()
+Span_dynamic_performer::stop_translation_timestep ()
 {
-  if (finished_dynamic_tuple_arr_.size () > 1
-     && finished_dynamic_tuple_arr_.top ().audio_l_->volume_i_)
+  if (finished_dynamic_tuples_.size () > 1)
     {
-      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_tuples_[0].audio_->volume_;
+      Real dv = finished_dynamic_tuples_.back ().audio_->volume_
 	- start_volume;
       /*
 	urg.
 	Catch and fix the case of:
 
-             |                         |
-	    x|                        x|
-            f cresc.  -- -- -- -- --  pp 
+	|                         |
+	x|                        x|
+	f cresc.  -- -- -- -- --  pp
 
-	 Actually, we should provide a non-displayed dynamic/volume setting,
-	 to set volume to 'ff' just before the pp.
-       */
+	Actually, we should provide a non-displayed dynamic/volume setting,
+	to set volume to 'ff' just before the pp.
+      */
       if (!dv || sign (dv) != finished_dir_)
 	{
-	  // urg.  about one volume step
-	  dv = (int)finished_dir_ * 13;
+	  // urg.  20%: about two volume steps
+	  dv = (Real)finished_dir_ * 0.2;
 	  if (!start_volume)
-	    start_volume = finished_dynamic_tuple_arr_.top
-	      ().audio_l_->volume_i_ - dv;
+	    start_volume = finished_dynamic_tuples_.back ().audio_->volume_
+	      - dv;
 	}
-      Moment start_mom = finished_dynamic_tuple_arr_[0].mom_;
-      Moment dt = finished_dynamic_tuple_arr_.top ().mom_ - start_mom;
-      for (int i=0; i < finished_dynamic_tuple_arr_.size (); i++)
+      Moment start_mom = finished_dynamic_tuples_[0].mom_;
+      Moment dt = finished_dynamic_tuples_.back ().mom_ - start_mom;
+      for (vsize i = 0; i < finished_dynamic_tuples_.size (); i++)
 	{
-	  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;
+	  Audio_dynamic_tuple *a = &finished_dynamic_tuples_[i];
+	  Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_
+	    / (Real)dt.main_part_;
+	  a->audio_->volume_ = volume;
 	}
-      finished_dynamic_tuple_arr_.clear ();
+      finished_dynamic_tuples_.clear ();
     }
 
-  if (span_req_l_drul_[STOP])
+  if (audio_)
     {
-      finished_dir_ = dir_;
-      if (!span_start_req_l_)
-	{
-	  span_req_l_drul_[STOP]->warning (_ ("can't find start of (de)crescendo"));
-	}
-      else
-	{
-	  span_start_req_l_ = 0;
-	  finished_dynamic_tuple_arr_ = dynamic_tuple_arr_;
-	  dynamic_tuple_arr_.clear ();
-	  if (finished_dynamic_tuple_arr_.size ())
-	    dynamic_tuple_arr_.push (finished_dynamic_tuple_arr_.top ());
-	}
+      audio_ = 0;
     }
 
-  if (span_req_l_drul_[START])
-    {
-      dir_ = span_req_l_drul_[START]->span_type_str_ == "crescendo"
-	? RIGHT : LEFT;
-      span_start_req_l_ = span_req_l_drul_[START];
-      audio_p_ = new Audio_dynamic (0);
-      Audio_element_info info (audio_p_, 0);
-      announce_element (info);
-
-      Audio_dynamic_tuple a = { audio_p_, now_mom () };
-      dynamic_tuple_arr_.push (a);
-    }
+  span_events_[STOP] = 0;
+  span_events_[START] = 0;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, decrescendo);
 void
-Span_dynamic_performer::do_pre_move_processing ()
+Span_dynamic_performer::listen_decrescendo (Stream_event *r)
 {
-  if (audio_p_)
-    {
-      play_element (audio_p_);
-      audio_p_ = 0;
-    }
+  Direction d = to_dir (r->get_property ("span-direction"));
+  span_events_[d] = r;
 }
 
+IMPLEMENT_TRANSLATOR_LISTENER (Span_dynamic_performer, crescendo);
 void
-Span_dynamic_performer::do_post_move_processing ()
+Span_dynamic_performer::listen_crescendo (Stream_event *r)
 {
-  span_req_l_drul_[STOP] = 0;
-  span_req_l_drul_[START] = 0;
+  Direction d = to_dir (r->get_property ("span-direction"));
+  span_events_[d] = r;
 }
 
-bool
-Span_dynamic_performer::do_try_music (Music* r)
-{
-  if (Span_req * s = dynamic_cast<Span_req*>(r))
-    {
-      if (s-> span_type_str_ == "crescendo"
-	  || s->span_type_str_ == "decrescendo")
-	{
-	  span_req_l_drul_[s->span_dir_] = s;
-	  return true;
-	}
-    }
-  return false;
-}
+ADD_TRANSLATOR (Span_dynamic_performer,
+		"", "",
+		"", "");