release: 1.5.14

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

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 2fb2e818a26827b253cc27527f82c65da4a32804..46a3b3f8cad24b0928c429d8afe1108656a08890 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -23,17 +23,14 @@ 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 do_try_music (Music*);
-  virtual void acknowledge_element (Audio_element_info);
-  virtual void process_acknowledged ();
-  void deprecated_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
+  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_;
@@ -46,8 +43,6 @@ private:
   Direction finished_dir_;
 };
 
-ADD_THIS_TRANSLATOR (Span_dynamic_performer);
-
 Span_dynamic_performer::Span_dynamic_performer ()
 {
   span_req_l_drul_[START] = 0;
@@ -58,7 +53,7 @@ Span_dynamic_performer::Span_dynamic_performer ()
 }
 
 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_))
     {
@@ -67,7 +62,7 @@ Span_dynamic_performer::acknowledge_element (Audio_element_info i)
 }
 
 void
-Span_dynamic_performer::deprecated_process_music ()
+Span_dynamic_performer::process_music ()
 {
   if (span_start_req_l_ || span_req_l_drul_[START])
     {
@@ -106,28 +101,24 @@ Span_dynamic_performer::deprecated_process_music ()
       Audio_dynamic_tuple a = { audio_p_, now_mom () };
       dynamic_tuple_arr_.push (a);
     }
-}
 
-void
-Span_dynamic_performer::process_acknowledged ()
-{
-  deprecated_process_music ();
-  if (span_req_l_drul_[STOP])
-   { 
-     finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
-   }
 
+  if (span_req_l_drul_[STOP])
+    { 
+      finished_dynamic_tuple_arr_.top ().audio_l_->volume_ = last_volume_;
+    }
+  
   if (span_req_l_drul_[START])
     {
-     dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
+      dynamic_tuple_arr_[0].audio_l_->volume_ = last_volume_;
     }
   span_start_req_l_ = 0;
   span_req_l_drul_[START] = 0;
   span_req_l_drul_[STOP] = 0;
 }
-  
+
 void
-Span_dynamic_performer::do_pre_move_processing ()
+Span_dynamic_performer::stop_translation_timestep ()
 {
   if (finished_dynamic_tuple_arr_.size () > 1)
     {
@@ -151,15 +142,15 @@ Span_dynamic_performer::do_pre_move_processing ()
          dv = (Real)finished_dir_ * 0.2;
          if (!start_volume)
            start_volume = finished_dynamic_tuple_arr_.top
-             ().audio_l_->volume_ - dv;
+ ().audio_l_->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++)
        {
          Audio_dynamic_tuple* a = &finished_dynamic_tuple_arr_[i];
-         Real volume = start_volume + dv * (Real)(a->mom_ - start_mom)
-           / (Real)dt;
+         Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_
+           / (Real)dt.main_part_;
          a->audio_l_->volume_ = volume;
        }
       finished_dynamic_tuple_arr_.clear ();
@@ -173,23 +164,24 @@ Span_dynamic_performer::do_pre_move_processing ()
 }
 
 void
-Span_dynamic_performer::do_post_move_processing ()
+Span_dynamic_performer::start_translation_timestep ()
 {
   span_req_l_drul_[STOP] = 0;
   span_req_l_drul_[START] = 0;
 }
 
 bool
-Span_dynamic_performer::do_try_music (Music* r)
+Span_dynamic_performer::try_music (Music* r)
 {
-  if (Span_req * s = dynamic_cast<Span_req*>(r))
+  if (Span_req * s = dynamic_cast<Span_req*> (r))
     {
       String t =  ly_scm2string (s->get_mus_property ("span-type"));      
       if (t == "crescendo" || t == "decrescendo")
        {
-         span_req_l_drul_[s->get_span_dir()] = s;
+         span_req_l_drul_[s->get_span_dir ()] = s;
          return true;
        }
     }
   return false;
 }
+ENTER_DESCRIPTION (Span_dynamic_performer, "","","","","" );