X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-column.cc;h=3b4fa4819038efef401ea2ef835c28d468caf357;hb=0e48c075bce7d60693c5324dab175a650d477f0a;hp=fd1255eda2279985fcfaf486f176e225b00be536;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git diff --git a/lily/audio-column.cc b/lily/audio-column.cc index fd1255eda2..3b4fa48190 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -1,34 +1,55 @@ /* - audio-column.cc -- implement Audio_column + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 1997--2011 Jan Nieuwenhuizen - (c) 1997--2001 Jan Nieuwenhuizen - */ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ #include "audio-column.hh" + #include "audio-item.hh" #include "performance.hh" -#include "debug.hh" - -Audio_column::Audio_column (Moment at_mom) +Audio_column::Audio_column (Moment when) { - at_mom_ = at_mom; - performance_l_ = 0; + when_ = when; } void -Audio_column::add_audio_item (Audio_item* l) +Audio_column::add_audio_item (Audio_item *l) { - audio_item_l_arr_.push (l); - l->audio_column_l_ = 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; }