X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-column.hh;h=059321f7c92f83789d150a381b6dbfcf7b75a3cf;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=b5f09403f87449591729a277ddfad90dbee6b81d;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index b5f09403f8..059321f7c9 100644
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,38 +1,49 @@
 /*
-  audio-column.hh -- declare Audio_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  Copyright (C) 1997--2015 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/>.
+*/
 
 #ifndef AUDIO_COLUMN_HH
 #define AUDIO_COLUMN_HH
 
-#include "proto.hh"
-#include "plist.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
-
+#include "std-vector.hh"
+#include "audio-element.hh"
 
 /**
-    generic audio grouped vertically.
- */
+   generic audio grouped vertically.
+*/
 
-class Audio_column { 
+class Audio_column : public Audio_element
+{
 public:
-    Audio_column (Moment at_mom);
-
-    void add (Audio_item* i_l);
-    Moment at_mom() const;
-    void print() const;
+  Audio_column (Moment when);
 
-    Link_list<Audio_item *> audio_item_l_list_;
-    Audio_score * audio_score_l_;
+  void add_audio_item (Audio_item *i);
+  Moment when () const;
 
-private:
-    Audio_column (Audio_column const&);
+  vector<Audio_item *> audio_items_;
+  Moment when_;
+  int ticks () const;
+protected:
+  void offset_when (Moment m);
+  friend class Score_performer;
 
-    Moment at_mom_;
 };
 
-
 #endif // AUDIO_COLUMN_HH