Imported sources

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

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 89f236ade30df0a8ba63d21554ab1270f9ca68a8..7c2375d90b34b83cccb5577b8dba7e4d9ba4f497 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -3,7 +3,7 @@
 
   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"
@@ -11,6 +11,11 @@
 #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_;
@@ -30,13 +35,12 @@ protected:
   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_;
   Real last_volume_;
-  Music* span_start_req_;
-  Drul_array<Music*> span_req_l_drul_;
+  Music* span_start_event_;
+  Drul_array<Music*> span_events_;
   Array<Audio_dynamic_tuple> dynamic_tuples_;
   Array<Audio_dynamic_tuple> finished_dynamic_tuples_;
   Direction dir_;
@@ -45,9 +49,9 @@ private:
 
 Span_dynamic_performer::Span_dynamic_performer ()
 {
-  span_req_l_drul_[START] = 0;
-  span_req_l_drul_[STOP] = 0;
-  span_start_req_ = 0;
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
+  span_start_event_ = 0;
   audio_ = 0;
   last_volume_ = 0;
 }
@@ -64,23 +68,23 @@ Span_dynamic_performer::acknowledge_audio_element (Audio_element_info i)
 void
 Span_dynamic_performer::process_music ()
 {
-  if (span_start_req_ || span_req_l_drul_[START])
+  if (span_start_event_ || span_events_[START])
     {
       audio_ = new Audio_dynamic (0);
-      Audio_element_info info (audio_, span_req_l_drul_[START]
-                              ? span_req_l_drul_[START]
-                              : span_req_l_drul_[STOP]);
+      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 (a);
     }
   
-  if (span_req_l_drul_[STOP])
+  if (span_events_[STOP])
     {
-      if (!span_start_req_)
+      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
        {
@@ -88,14 +92,14 @@ Span_dynamic_performer::process_music ()
          finished_dynamic_tuples_ = dynamic_tuples_;
        }
       dynamic_tuples_.clear ();
-      span_start_req_ = 0;
+      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_ = span_req_l_drul_[START];
+      dir_ =  (span_events_[START]->is_mus_type ("crescendo-event"))
+       ? RIGHT : LEFT;
+      span_start_event_ = span_events_[START];
       
       dynamic_tuples_.clear ();
       Audio_dynamic_tuple a = { audio_, now_mom () };
@@ -103,18 +107,18 @@ Span_dynamic_performer::process_music ()
     }
 
 
-  if (span_req_l_drul_[STOP])
+  if (span_events_[STOP])
     { 
       finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_;
     }
   
-  if (span_req_l_drul_[START])
+  if (span_events_[START])
     {
       dynamic_tuples_[0].audio_->volume_ = last_volume_;
     }
-  span_start_req_ = 0;
-  span_req_l_drul_[START] = 0;
-  span_req_l_drul_[STOP] = 0;
+  span_start_event_ = 0;
+  span_events_[START] = 0;
+  span_events_[STOP] = 0;
 }
 
 void
@@ -161,13 +165,10 @@ Span_dynamic_performer::stop_translation_timestep ()
       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
@@ -177,7 +178,7 @@ Span_dynamic_performer::try_music (Music* r)
       || r->is_mus_type ("decrescendo-event"))
     {
       Direction d = to_dir (r->get_mus_property ("span-direction"));
-      span_req_l_drul_[d] = r;
+      span_events_[d] = r;
       return true;
     }
   return false;