release: 1.3.110

[lilypond.git] / lily / piano-pedal-performer.cc

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index c3d2a1a0f4eb322a3a7271ff10e0fcfbb5607fb9..f5837a110b13ab63cceb991546c30d097d7f5416 100644 (file)
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -31,11 +31,11 @@ public:
   ~Piano_pedal_performer ();
   
 protected:
-  virtual void do_creation_processing ();
-  virtual bool do_try_music (Music*);
-  virtual void do_process_music ();
-  virtual void do_pre_move_processing ();
-  virtual void do_post_move_processing ();
+  virtual void initialize ();
+  virtual bool try_music (Music*);
+  virtual void create_grobs ();
+  virtual void stop_translation_timestep ();
+  virtual void start_translation_timestep ();
 
 private:
   Link_array<Audio_piano_pedal> audio_p_arr_;
@@ -55,7 +55,7 @@ Piano_pedal_performer::~Piano_pedal_performer()
 }
 
 void
-Piano_pedal_performer::do_creation_processing ()
+Piano_pedal_performer::initialize ()
 {
   info_alist_ = new Pedal_info[4];
   Pedal_info *p = info_alist_;
@@ -75,16 +75,16 @@ Piano_pedal_performer::do_creation_processing ()
 }
 
 void
-Piano_pedal_performer::do_process_music ()
+Piano_pedal_performer::create_grobs ()
 {
-  for (Pedal_info*p = info_alist_; p->name_; p ++)
+  for (Pedal_info*p = info_alist_; p && p->name_; p ++)
  
     {
       if (p->req_l_drul_[STOP])
        {
          if (!p->start_req_l_)
            {
-             p->req_l_drul_[STOP]->warning (_f ("can't find start of piano pedal: %s", String (p->name_)));
+             p->req_l_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: %s", String (p->name_)));
            }
          else
            {
@@ -104,11 +104,13 @@ Piano_pedal_performer::do_process_music ()
          a->dir_ = START;
          audio_p_arr_.push (a);
        }
+      p->req_l_drul_[START] = 0;
+      p->req_l_drul_[STOP] = 0;
     }
 }
 
 void
-Piano_pedal_performer::do_pre_move_processing ()
+Piano_pedal_performer::stop_translation_timestep ()
 {
   for (int i=0; i< audio_p_arr_.size (); i++)
     play_element (audio_p_arr_[i]);
@@ -116,9 +118,9 @@ Piano_pedal_performer::do_pre_move_processing ()
 }
 
 void
-Piano_pedal_performer::do_post_move_processing ()
+Piano_pedal_performer::start_translation_timestep ()
 {
-  for (Pedal_info*p = info_alist_; p->name_; p ++)
+  for (Pedal_info*p = info_alist_; p && p->name_; p ++)
     {
       p->req_l_drul_[STOP] = 0;
       p->req_l_drul_[START] = 0;
@@ -126,15 +128,16 @@ Piano_pedal_performer::do_post_move_processing ()
 }
 
 bool
-Piano_pedal_performer::do_try_music (Music* r)
+Piano_pedal_performer::try_music (Music* r)
 {
   if (Span_req * s = dynamic_cast<Span_req*>(r))
     {
       for (Pedal_info*p = info_alist_; p->name_; p ++)
        {
-         if (s->span_type_str_ == String (p->name_))
+         if (scm_equal_p (s->get_mus_property ("span-type"),
+                          ly_str02scm (p->name_)) == SCM_BOOL_T)
            {
-             p->req_l_drul_[s->span_dir_] = s;
+             p->req_l_drul_[s->get_span_dir()] = s;
              return true;
            }
        }