X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformance.hh;h=84bb13bdff873d10d2fdcb2269dc48f78d44a6d3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=416349371183f93905c1327dd9c1463d2c1146dd;hpb=664070d837cc4855091455892cb942cdcedeef0c;p=lilypond.git diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 4163493711..84bb13bdff 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--2008 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,17 +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); + virtual void process (); + void remap_grace_durations (); + void output (Midi_stream &midi_stream) const; + void output_header_track (Midi_stream &midi_stream) const; void print () const; - SCM process (String); + void write_output (string filename) const; - Link_array audio_staffs_; - Cons *audio_elem_p_list_; + vector audio_staffs_; + vector audio_elements_; Output_def *midi_; };