2003 -> 2004

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

diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh
index 5b6f8d4d8a63740ddb276c74e155cb2b39da38dd..18f51d5bfba764c270cfacb68c7dc6a53586efdb 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--2000 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"
@@ -21,12 +21,12 @@ class Audio_column : public Audio_element  {
 public:
   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;
+  void print () const;
 
-  Link_array<Audio_item> audio_item_l_arr_;
-  Performance * performance_l_;
+  Link_array<Audio_item> audio_items_;
+  Performance * performance_;
 
 private:
   Audio_column (Audio_column const&);