X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspan-dynamic-performer.cc;h=edd25919edb27f796d349d2a2993208f45e2f243;hb=94b46751bb219ecfe55543c4030c4dd2d9c2ca74;hp=edc3add567540dd15ec6e106178fcb09d56d74b1;hpb=3b3e161088f1a4be942e67729d0f89f0e8d31c51;p=lilypond.git

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index edc3add567..edd25919ed 100644
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -3,17 +3,22 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2000--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "performer.hh"
-#include "command-request.hh"
-#include "musical-request.hh"
+
+#include "event.hh"
 #include "audio-item.hh"
 
+/*
+  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_;
 };
 
@@ -23,43 +28,38 @@ struct Audio_dynamic_tuple
 class Span_dynamic_performer : public Performer
 {
 public:
-  VIRTUAL_COPY_CONS (Translator);
-  
-  Span_dynamic_performer ();
+  TRANSLATOR_DECLARATIONS (Span_dynamic_performer);
 
 protected:
   virtual bool try_music (Music*);
   virtual void acknowledge_audio_element (Audio_element_info);
   virtual void process_music ();
   virtual void stop_translation_timestep ();
-  virtual void start_translation_timestep ();
 
 private:
-  Audio_dynamic* audio_p_;
+  Audio_dynamic* audio_;
   Real last_volume_;
-  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_;
+  Music* span_start_event_;
+  Drul_array<Music*> span_events_;
+  Array<Audio_dynamic_tuple> dynamic_tuples_;
+  Array<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_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_;
     }
@@ -68,66 +68,65 @@ Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i)
 void
 Span_dynamic_performer::process_music ()
 {
-  if (span_start_req_l_ || span_req_l_drul_[START])
+  if (span_start_event_ || span_events_[START])
     {
-      audio_p_ = new Audio_dynamic (0);
-      Audio_element_info info (audio_p_, span_req_l_drul_[START]
-			       ? span_req_l_drul_[START]
-			       : span_req_l_drul_[STOP]);
+      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_p_, now_mom () };
-      dynamic_tuple_arr_.push (a);
+      Audio_dynamic_tuple a = { audio_, now_mom () };
+      dynamic_tuples_.push (a);
     }
   
-  if (span_req_l_drul_[STOP])
+  if (span_events_[STOP])
     {
-      if (!span_start_req_l_)
+      if (!span_start_event_)
 	{
-	  span_req_l_drul_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
-	  span_req_l_drul_[STOP] = 0;
+	  span_events_[STOP]->origin ()->warning (_ ("can't find start of (de)crescendo"));
+	  span_events_[STOP] = 0;
 	}
       else
 	{
 	  finished_dir_ = dir_;
-	  finished_dynamic_tuple_arr_ = dynamic_tuple_arr_;
+	  finished_dynamic_tuples_ = dynamic_tuples_;
 	}
-      dynamic_tuple_arr_.clear ();
-      span_start_req_l_ = 0;
+      dynamic_tuples_.clear ();
+      span_start_event_ = 0;
     }
 
-  if (span_req_l_drul_[START])
+  if (span_events_[START])
     {
-      String t = ly_scm2string (span_req_l_drul_[START]->get_mus_property ("span-type"));
-      dir_ = (t == "crescendo")	? RIGHT : LEFT;
-      span_start_req_l_ = span_req_l_drul_[START];
+      dir_ =  (span_events_[START]->is_mus_type ("crescendo-event"))
+	? RIGHT : LEFT;
+      span_start_event_ = span_events_[START];
       
-      dynamic_tuple_arr_.clear ();
-      Audio_dynamic_tuple a = { audio_p_, now_mom () };
-      dynamic_tuple_arr_.push (a);
+      dynamic_tuples_.clear ();
+      Audio_dynamic_tuple a = { audio_, now_mom () };
+      dynamic_tuples_.push (a);
     }
 
-
-  if (span_req_l_drul_[STOP])
+  if (span_events_[STOP])
     { 
-      finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
+      finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_;
     }
   
-  if (span_req_l_drul_[START])
+  if (span_events_[START])
     {
-      dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
+      dynamic_tuples_[0].audio_->volume_ = last_volume_;
     }
-  span_start_req_l_ = 0;
-  span_req_l_drul_[START] = 0;
-  span_req_l_drul_[STOP] = 0;
+
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
 }
 
 void
 Span_dynamic_performer::stop_translation_timestep ()
 {
-  if (finished_dynamic_tuple_arr_.size () > 1)
+  if (finished_dynamic_tuples_.size () > 1)
     {
-      Real start_volume = finished_dynamic_tuple_arr_[0].audio_l_->volume_;
-      Real dv = finished_dynamic_tuple_arr_.top ().audio_l_->volume_
+      Real start_volume = finished_dynamic_tuples_[0].audio_->volume_;
+      Real dv = finished_dynamic_tuples_.top ().audio_->volume_
 	- start_volume;
       /*
 	urg.
@@ -145,46 +144,45 @@ Span_dynamic_performer::stop_translation_timestep ()
 	  // 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_ - dv;
+	    start_volume = finished_dynamic_tuples_.top
+ ().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_.top ().mom_ - start_mom;
+      for (int 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_ = 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 (audio_p_)
+  if (audio_)
     {
-      play_element (audio_p_);
-      audio_p_ = 0;
+      play_element (audio_);
+      audio_ = 0;
     }
-}
 
-void
-Span_dynamic_performer::start_translation_timestep ()
-{
-  span_req_l_drul_[STOP] = 0;
-  span_req_l_drul_[START] = 0;
+  span_events_[STOP] = 0;
+  span_events_[START] = 0;
+
 }
 
 bool
 Span_dynamic_performer::try_music (Music* r)
 {
-  if (Span_req * s = dynamic_cast<Span_req*>(r))
+  if (r->is_mus_type ("crescendo-event")
+      || r->is_mus_type ("decrescendo-event"))
     {
-      String t =  ly_scm2string (s->get_mus_property ("span-type"));      
-      if (t == "crescendo" || t == "decrescendo")
-	{
-	  span_req_l_drul_[s->get_span_dir()] = s;
-	  return true;
-	}
+      Direction d = to_dir (r->get_property ("span-direction"));
+      span_events_[d] = r;
+      return true;
     }
   return false;
 }
+ENTER_DESCRIPTION (Span_dynamic_performer,
+		   "", "",
+		   "crescendo-event decrescendo-event", 
+		   "", "", "");