* lily/tie-formatting-problem.cc (score_configuration): use

[lilypond.git] / lily / tie-performer.cc

diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc
index 7482c0434b01b27861b8022974308d4c0f8824ac..bf3c513bcbdf578ba1aa44814500fcea2c54e178 100644 (file)
--- a/lily/tie-performer.cc
+++ b/lily/tie-performer.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1998--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1998--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "performer.hh"
@@ -13,13 +13,12 @@
 #include "audio-item.hh"
 #include "pqueue.hh"
 
-
 class Tie_performer : public Performer
 {
   Music *event_;
   Music *last_event_;
-  Array<Audio_element_info> now_heads_;
-  Array<Audio_element_info> heads_to_tie_;
+  vector<Audio_element_info> now_heads_;
+  vector<Audio_element_info> heads_to_tie_;
 
   bool ties_created_;
 
@@ -44,9 +43,7 @@ bool
 Tie_performer::try_music (Music *mus)
 {
   if (mus->is_mus_type ("tie-event"))
-    {
-      event_ = mus;
-    }
+    event_ = mus;
 
   return true;
 }
@@ -63,8 +60,8 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 {
   if (Audio_note *an = dynamic_cast<Audio_note *> (inf.elem_))
     {
-      now_heads_.push (inf);
-      for (int i = heads_to_tie_.size (); i--;)
+      now_heads_.push_back (inf);
+      for (vsize i = heads_to_tie_.size (); i--;)
        {
          Music *right_mus = inf.event_;
 
@@ -73,7 +70,7 @@ Tie_performer::acknowledge_audio_element (Audio_element_info inf)
 
          if (right_mus && left_mus
              && ly_is_equal (right_mus->get_property ("pitch"),
-                              left_mus->get_property ("pitch")))
+                             left_mus->get_property ("pitch")))
            {
              an->tie_to (th);
              ties_created_ = true;