X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=1cc827a2767fff90abde602dbaf450f40af3f493;hb=d74c5951c66218f389394fe879d18f86131cf612;hp=5705a9c7b0b1d8bf33b7d1fcef96745fb74651c9;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index 5705a9c7b0..1cc827a276 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -1,38 +1,39 @@ /* audio-column.hh -- declare Audio_column - (c) 1997--2001 Jan Nieuwenhuizen - */ + (c) 1997--2006 Jan Nieuwenhuizen +*/ #ifndef AUDIO_COLUMN_HH #define AUDIO_COLUMN_HH -#include "flower-proto.hh" #include "lily-proto.hh" #include "moment.hh" -#include "parray.hh" +#include "std-vector.hh" #include "audio-element.hh" /** - generic audio grouped vertically. - */ + generic audio grouped vertically. +*/ -class Audio_column : public Audio_element { +class Audio_column : public Audio_element +{ public: Audio_column (Moment at_mom); - void add_audio_item (Audio_item* i_l); - Moment at_mom() const; - void print() const; + void add_audio_item (Audio_item *i); + Moment at_mom () const; - Link_array audio_item_l_arr_; - Performance * performance_l_; + vector audio_items_; + +protected: + void offset_at_mom (Moment m); + friend class Score_performer; private: - Audio_column (Audio_column const&); + Audio_column (Audio_column const &); Moment at_mom_; }; - #endif // AUDIO_COLUMN_HH