* lily/translator.cc (derived_mark): new function.

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

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 3cd36d94e8721169e3a6ea1b1ed646d16a0de908..9b78075c6e6999eb69ce6b49502c2633f6947038 100644 (file)
--- a/lily/include/audio-column.hh
+++ b/lily/include/audio-column.hh
@@ -1,13 +1,13 @@
 /*
   audio-column.hh -- declare Audio_column
 
-  (c)  1997--1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef AUDIO_COLUMN_HH
 #define AUDIO_COLUMN_HH
 
-#include "proto.hh"
+#include "flower-proto.hh"
 #include "lily-proto.hh"
 #include "moment.hh"
 #include "parray.hh"
@@ -19,19 +19,17 @@
 
 class Audio_column : public Audio_element  { 
 public:
-    Audio_column (Moment at_mom);
+  Audio_column (Moment at_mom);
 
-    void add_audio_item (Audio_item* i_l);
-    Moment at_mom() const;
-    void print() const;
+  void add_audio_item (Audio_item* i);
+  Moment at_mom () const;
 
-    Link_array<Audio_item> audio_item_l_arr_;
-    Performance * performance_l_;
+  Link_array<Audio_item> audio_items_;
 
 private:
-    Audio_column (Audio_column const&);
+  Audio_column (Audio_column const&);
 
-    Moment at_mom_;
+  Moment at_mom_;
 };