* lily/book.cc (process): bugfix: flip ?: cases.

[lilypond.git] / lily / include / performance.hh

diff --git a/lily/include/performance.hh b/lily/include/performance.hh
index 907b1ec9989a7dbf6e70c547e5698e66a3f7d6ba..2fad187dcbebd2335a58d674b94a888c3b5d61d0 100644 (file)
--- a/lily/include/performance.hh
+++ b/lily/include/performance.hh
@@ -1,14 +1,13 @@
 /*
   performance.hh -- declare Performance
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef PERFORMANCE_HH
 #define PERFORMANCE_HH
 
 #include "parray.hh"
-#include "lily-proto.hh"
 #include "cons.hh"
 #include "music-output.hh"
 
@@ -19,17 +18,17 @@ public:
   Performance ();
   ~Performance ();
 
-  void add_element (Audio_element*p);
-    
-  void output (Midi_stream& midi_stream_r);
-  void output_header_track (Midi_stream& midi_stream_r);
+  void add_element (Audio_element *p);
+
+  void output (Midi_stream &midi_stream_r);
+  void output_header_track (Midi_stream &midi_stream_r);
 
   void print () const;
-  SCM process (String);
+  void write_output (String filename);
 
   Link_array<Audio_staff> audio_staffs_;
-  Cons<Audio_element> *audio_elem_p_list_;
-  Midi_def *midi_;
+  Cons<Audio_element> *audio_element_list_;
+  Output_def *midi_;
 };
 
 #endif /* PERFORMANCE_HH */