X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=inline;f=lily%2Finclude%2Fperformance.hh;h=2553131f10aa29d89455dcd16f4eb75e9714daae;hb=996e6483a80a4748db2fdd7104bf1c605f9260be;hp=3e34dc7cf595d9b48e68363aa49489724339459d;hpb=73be5f6fe264e90a56e45f2d70129b133731188b;p=lilypond.git diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 3e34dc7cf5..2553131f10 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -1,41 +1,35 @@ /* performance.hh -- declare Performance - (c) 1997--1999 Jan Nieuwenhuizen - */ + (c) 1997--2009 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" -/** 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 (); + DECLARE_CLASSNAME(Performance); - void add_column (Audio_column*); - void add_staff (Audio_staff* l); - 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; - void process(); + 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; + void write_output (string filename) const; - Link_array audio_staff_l_arr_; - Cons *audio_elem_p_list_; - Midi_def * midi_l_; + vector audio_staffs_; + vector audio_elements_; + Output_def *midi_; }; -#endif // PERFORMANCE_HH +#endif /* PERFORMANCE_HH */