X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformance.hh;h=90a825bb1d3ce3cb165a8217eba6ac7e7c01f3b4;hb=fdc410ddf1a25df4a7a1cdf8af05d20f1d003a1d;hp=bc7067a4af6fc6de155b46a90b34a85f0a64dc7c;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index bc7067a4af..90a825bb1d 100644
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -1,40 +1,34 @@
 /*
   performance.hh -- declare Performance
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef PERFORMANCE_HH
 #define PERFORMANCE_HH
 
-#include "lily-proto.hh"
-#include "plist.hh"
+#include "std-vector.hh"
 #include "music-output.hh"
 
-/** all stuff which goes onto midi. notes, signs, symbols in a score
-     #Performance# contains the items, the columns.
-    */
-
-class Performance : public Music_output {
+/* MIDI output.  */
+class Performance : public Music_output
+{
 public:
   Performance ();
-  ~Performance () {}
+  ~Performance ();
+  DECLARE_CLASSNAME(Performance);
 
-  void add_column (Audio_column*);
-  void add_staff (Audio_staff* l);
-  void add_element (Audio_element*p);
+  void add_element (Audio_element *p);
 
-    
-  void output (Midi_stream& midi_stream_r);
-  void output_header_track (Midi_stream& midi_stream_r);
+  void output (Midi_stream &midi_stream_r);
+  void output_header_track (Midi_stream &midi_stream_r);
 
-  void print() const;
-  void process();
+  void print () const;
+  void write_output (string filename);
 
-  Pointer_list<Audio_column*> audio_column_p_list_;
-  Link_list<Audio_staff*> audio_staff_l_list_;
-  Pointer_list<Audio_element*> audio_elem_p_list_;
-  Midi_def  * midi_l_;
+  vector<Audio_staff*> audio_staffs_;
+  vector<Audio_element*> audio_elements_;
+  Output_def *midi_;
 };
 
-#endif // PERFORMANCE_HH
+#endif /* PERFORMANCE_HH */