X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-column.cc;h=60cfe593cf6a06dd2f4b442eac3741810be1d9fa;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=5b6717c01519a952cc9cc4a296d3393e8a79a46d;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 5b6717c015..60cfe593cf 100644
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -1,45 +1,53 @@
 /*
-  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--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  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 <http://www.gnu.org/licenses/>.
+*/
 
 #include "audio-column.hh"
-#include "audio-item.hh"
-#include "performance.hh"
 
-#include "debug.hh"
+#include "audio-item.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_list_.bottom().add (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 at_mom_;
+  return int (moment_to_ticks (when_));
 }
 
 void
-Audio_column::print() const
+Audio_column::offset_when (Moment m)
 {
-#ifndef NPRINT
-  DOUT << "Audio_column {";
-  DOUT << "at: " << at_mom_ << ". Contains:";
-  for (PCursor<Audio_item*> i (audio_item_l_list_.top ()); i.ok (); i++)
-    DOUT << i->name () << ", ";
-  DOUT << "\n}\n";
-#endif 
+  when_ += m;
 }