(Paper_column): copy rank_. This fixes

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

diff --git a/lily/span-dynamic-performer.cc b/lily/span-dynamic-performer.cc
index 7c2375d90b34b83cccb5577b8dba7e4d9ba4f497..52afe553a40fe3ce0c1131f76840376b332b7f1c 100644 (file)
--- a/lily/span-dynamic-performer.cc
+++ b/lily/span-dynamic-performer.cc
@@ -7,8 +7,6 @@
 */
 
 #include "performer.hh"
-
-#include "event.hh"
 #include "audio-item.hh"
 
 /*
@@ -28,7 +26,7 @@ struct Audio_dynamic_tuple
 class Span_dynamic_performer : public Performer
 {
 public:
-  TRANSLATOR_DECLARATIONS(Span_dynamic_performer);
+  TRANSLATOR_DECLARATIONS (Span_dynamic_performer);
 
 protected:
   virtual bool try_music (Music*);
@@ -106,7 +104,6 @@ Span_dynamic_performer::process_music ()
       dynamic_tuples_.push (a);
     }
 
-
   if (span_events_[STOP])
     { 
       finished_dynamic_tuples_.top ().audio_->volume_ = last_volume_;
@@ -116,7 +113,7 @@ Span_dynamic_performer::process_music ()
     {
       dynamic_tuples_[0].audio_->volume_ = last_volume_;
     }
-  span_start_event_ = 0;
+
   span_events_[START] = 0;
   span_events_[STOP] = 0;
 }
@@ -150,7 +147,7 @@ Span_dynamic_performer::stop_translation_timestep ()
        }
       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++)
+      for (int i= 0; i < finished_dynamic_tuples_.size (); i++)
        {
          Audio_dynamic_tuple* a = &finished_dynamic_tuples_[i];
          Real volume = start_volume + dv * (Real) (a->mom_ - start_mom).main_part_
@@ -177,7 +174,7 @@ Span_dynamic_performer::try_music (Music* r)
   if (r->is_mus_type ("crescendo-event")
       || r->is_mus_type ("decrescendo-event"))
     {
-      Direction d = to_dir (r->get_mus_property ("span-direction"));
+      Direction d = to_dir (r->get_property ("span-direction"));
       span_events_[d] = r;
       return true;
     }