Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / lily / include / audio-column.hh

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 77eee19537d2731c83f81f745722237d3be66f33..0212a45268bcc3013a379529d00a62550982aac8 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,7 +1,20 @@
 /*
-  audio-column.hh -- declare Audio_column
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  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
@@ -19,17 +32,18 @@
 class Audio_column : public Audio_element
 {
 public:
-  Audio_column (Moment at_mom);
+  Audio_column (Moment when);
 
   void add_audio_item (Audio_item *i);
-  Moment at_mom () const;
-
-  vector<Audio_item*> audio_items_;
+  Moment when () const;
 
-private:
-  Audio_column (Audio_column const &);
+  std::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