X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Faudio-column.cc;h=4c24351aa40d2fdea2cbdcc3c1cf27e744e78c49;hb=8cab78caa0db1ba14f2e52e4c1ddbb541ea0e5cb;hp=2f5ad611a68dc778118d1deb8961cf742951e7c3;hpb=69b9cead5afe7164b9053d26eba582fec3825ef8;p=lilypond.git

diff --git a/lily/audio-column.cc b/lily/audio-column.cc
index 2f5ad611a6..4c24351aa4 100644
--- a/lily/audio-column.cc
+++ b/lily/audio-column.cc
@@ -3,43 +3,42 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1998 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #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* 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;
 }
 
+