X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-column.cc;h=0b60edf6be790540bf8836c9e279079c6c8bffc7;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=52a63e767c47830ba31fa784455a754d9c27242c;hpb=a6ee9dcd388111e842064a8d46ab06c4897a00d2;p=lilypond.git diff --git a/lily/audio-column.cc b/lily/audio-column.cc index 52a63e767c..0b60edf6be 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -3,32 +3,42 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2002 Jan Nieuwenhuizen - */ + (c) 1997--2008 Jan Nieuwenhuizen +*/ #include "audio-column.hh" + #include "audio-item.hh" #include "performance.hh" - - -Audio_column::Audio_column (Moment at_mom) +Audio_column::Audio_column (Moment when) { - at_mom_ = at_mom; - performance_ = 0; + when_ = when; } void -Audio_column::add_audio_item (Audio_item* l) +Audio_column::add_audio_item (Audio_item *l) { - audio_items_.push (l); - l->audio_column_ = this; + audio_items_.push_back (l); + l->audio_column_ = this; } Moment -Audio_column::at_mom () const +Audio_column::when () const +{ + return when_; +} + +int +Audio_column::ticks () const +{ + return int (moment_to_ticks (when_)); +} + +void +Audio_column::offset_when (Moment m) { - return at_mom_; + when_ += m; }