X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=0b10c8bd4d479faf633458a7407db7dd0014c4ee;hb=7c866230d0fb5c9b997d1c792378a85818206125;hp=06ba4b0ec74ca1aa5132646858c028d33d218645;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index 06ba4b0ec7..0b10c8bd4d 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -1,35 +1,36 @@ /* audio-column.hh -- declare Audio_column - (c) 1997--2004 Jan Nieuwenhuizen - */ + (c) 1997--2007 Jan Nieuwenhuizen +*/ #ifndef AUDIO_COLUMN_HH #define AUDIO_COLUMN_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); + Audio_column (Moment when); - void add_audio_item (Audio_item* i); - Moment at_mom () const; + void add_audio_item (Audio_item *i); + Moment when () const; - Link_array audio_items_; + vector audio_items_; + Moment when_; + int ticks () const ; +protected: + void offset_when (Moment m); + friend class Score_performer; -private: - Audio_column (Audio_column const&); - - Moment at_mom_; }; - #endif // AUDIO_COLUMN_HH