X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformance.hh;h=90a825bb1d3ce3cb165a8217eba6ac7e7c01f3b4;hb=a96e5623ddcb8ee6c5631c60d90d5a0499f4f4d0;hp=907b1ec9989a7dbf6e70c547e5698e66a3f7d6ba;hpb=1b401824fa6fa77ba5ba52cc9b1735a9aa43eb20;p=lilypond.git diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 907b1ec998..90a825bb1d 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -1,15 +1,13 @@ /* performance.hh -- declare Performance - (c) 1997--2004 Jan Nieuwenhuizen - */ + (c) 1997--2006 Jan Nieuwenhuizen +*/ #ifndef PERFORMANCE_HH #define PERFORMANCE_HH -#include "parray.hh" -#include "lily-proto.hh" -#include "cons.hh" +#include "std-vector.hh" #include "music-output.hh" /* MIDI output. */ @@ -18,18 +16,19 @@ class Performance : public Music_output public: Performance (); ~Performance (); + DECLARE_CLASSNAME(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_staffs_; - Cons *audio_elem_p_list_; - Midi_def *midi_; + vector audio_staffs_; + vector audio_elements_; + Output_def *midi_; }; #endif /* PERFORMANCE_HH */