lilypond-1.1.35

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 85f88c84f9a916a9f8dc4b463484536434c3fd8a..7a90fa256244897ecfc9431e6d34ee854e6d1d9c 100644 (file)
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -21,7 +21,7 @@ Audio_column::Audio_column (Moment at_mom)
 void
 Audio_column::add_audio_item (Audio_item* l)
 {
-  audio_item_l_list_.bottom().add (l);
+  audio_item_l_arr_.push (l);
   l->audio_column_l_ = this; 
 }
 
@@ -37,8 +37,8 @@ Audio_column::print() const
 #ifndef NPRINT
   DOUT << "Audio_column {";
   DOUT << "at: " << at_mom_ << ". Contains:";
-  for (PCursor<Audio_item*> i (audio_item_l_list_.top ()); i.ok (); i++)
-    DOUT << classname (i.ptr ()) << ", ";
+  for (int i =0; i < audio_item_l_arr_.size (); i++)
+    DOUT << classname (audio_item_l_arr_[i]) << ", ";
   DOUT << "\n}\n";
 #endif 
 }

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 42836a54b4e6159f60f3c82fea1fae1fc2aab0fe..3cd36d94e8721169e3a6ea1b1ed646d16a0de908 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -8,10 +8,9 @@
 #define AUDIO_COLUMN_HH
 
 #include "proto.hh"
-#include "plist.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
-#include "pcursor.hh"
+#include "parray.hh"
 #include "audio-element.hh"
 
 /**
@@ -26,7 +25,7 @@ public:
     Moment at_mom() const;
     void print() const;
 
-    Link_list<Audio_item *> audio_item_l_list_;
+    Link_array<Audio_item> audio_item_l_arr_;
     Performance * performance_l_;
 
 private:

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 3e34dc7cf595d9b48e68363aa49489724339459d..55e9b44052d3bc846c58d552822e27a51a215d6e 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -21,10 +21,7 @@ public:
   Performance ();
   ~Performance ();
 
-  void add_column (Audio_column*);
-  void add_staff (Audio_staff* l);
   void add_element (Audio_element*p);
-
     
   void output (Midi_stream& midi_stream_r);
   void output_header_track (Midi_stream& midi_stream_r);

diff --git a/lily/score-performer.cc b/lily/score-performer.cc
index b06e4286e2b7af7f9d9988058de3fa1e70b63f8a..4729fc302e5ffe57daf5c4f1151d54bb363e77db 100644 (file)
--- a/lily/score-performer.cc
+++ b/lily/score-performer.cc
@@ -39,10 +39,6 @@ Score_performer::play (Audio_element * p)
     {
       audio_column_l_->add_audio_item (i);
     }
-  else if (Audio_staff*s=dynamic_cast<Audio_staff *> (p)) 
-    {
-      performance_p_->add_staff (s);
-    }
   performance_p_->add_element (p);
 }
 
@@ -51,7 +47,7 @@ Score_performer::prepare (Moment m)
 {
   Global_translator::prepare (m);
   audio_column_l_ = new Audio_column (m);
-  performance_p_->add_column (audio_column_l_);
+  play (audio_column_l_);
   post_move_processing ();
 }