Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / include / audio-staff.hh

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 6ba1155a41940dffd4f174e44717798467f51cbb..fa6e1b942942a5958d057a0c1456a11cec65e223 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -7,7 +7,7 @@
 #ifndef AUDIO_STAFF_HH
 #define AUDIO_STAFF_HH
 
-#include "parray.hh"
+#include "std-vector.hh"
 #include "lily-proto.hh"
 #include "audio-element.hh"
 
@@ -16,7 +16,9 @@ struct Audio_staff : public Audio_element
   void add_audio_item (Audio_item *l);
   void output (Midi_stream &midi_stream_r, int track_i);
 
-  Link_array<Audio_item> audio_items_;
+  Audio_staff ();
+  
+  vector<Audio_item*> audio_items_;
   int channel_;
 };