* lily/translator-group.cc (connect_to_context): non const error message.

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

diff --git a/lily/piano-pedal-performer.cc b/lily/piano-pedal-performer.cc
index e19feb9e42c2415c8a01d5b7a7c93d3440ac297b..4083c468f915279fbb19ea5f2d0da57264f6f13d 100644 (file)
--- a/lily/piano-pedal-performer.cc
+++ b/lily/piano-pedal-performer.cc
@@ -7,7 +7,9 @@
 */
 
 #include "performer.hh"
+
 #include "audio-item.hh"
+#include "international.hh"
 #include "music.hh"
 
 /**
@@ -34,7 +36,7 @@ protected:
   void start_translation_timestep ();
 
 private:
-  Link_array<Audio_piano_pedal> audios_;
+  vector<Audio_piano_pedal*> audios_;
   Pedal_info *info_alist_;
 };
 
@@ -77,13 +79,13 @@ Piano_pedal_performer::process_music ()
       if (p->event_drul_[STOP])
        {
          if (!p->start_event_)
-           p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", String (p->name_)));
+           p->event_drul_[STOP]->origin ()->warning (_f ("can't find start of piano pedal: `%s'", string (p->name_)));
          else
            {
              Audio_piano_pedal *a = new Audio_piano_pedal;
-             a->type_string_ = String (p->name_);
+             a->type_string_ = string (p->name_);
              a->dir_ = STOP;
-             audios_.push (a);
+             audios_.push_back (a);
               Audio_element_info info(a, p->event_drul_[STOP]);
               announce_element (info);
            }
@@ -94,9 +96,9 @@ Piano_pedal_performer::process_music ()
        {
          p->start_event_ = p->event_drul_[START];
          Audio_piano_pedal *a = new Audio_piano_pedal;
-         a->type_string_ = String (p->name_);
+         a->type_string_ = string (p->name_);
          a->dir_ = START;
-         audios_.push (a);
+         audios_.push_back (a);
           Audio_element_info info(a, p->event_drul_[START]);
           announce_element (info);
        }
@@ -108,7 +110,7 @@ Piano_pedal_performer::process_music ()
 void
 Piano_pedal_performer::stop_translation_timestep ()
 {
-  for (int i = 0; i < audios_.size (); i++)
+  for (vsize i = 0; i < audios_.size (); i++)
     play_element (audios_[i]);
   audios_.clear ();
 }
@@ -130,7 +132,7 @@ Piano_pedal_performer::try_music (Music *r)
     {
       for (Pedal_info *p = info_alist_; p->name_; p++)
        {
-         String nm = p->name_ + String ("Event");
+         string nm = p->name_ + string ("Event");
          if (ly_is_equal (r->get_property ("name"),
                           scm_str2symbol (nm.c_str ())))
            {