* lily/kpath.cc:

[lilypond.git] / lily / audio-staff.cc

diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc
index 73bb4e8ebcb85e71ef91dfa04305f454ad746473..7c3c944a289d11db6cd8ef406c6bc72308eff1e9 100644 (file)
--- a/lily/audio-staff.cc
+++ b/lily/audio-staff.cc
@@ -3,11 +3,11 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "audio-staff.hh"
-#include "audio-item.hh"
+
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "midi-walker.hh"
@@ -15,7 +15,7 @@
 void
 Audio_staff::add_audio_item (Audio_item* l)
 {
-  audio_item_l_arr_.push (l);
+  audio_items_.push (l);
 }
 
 
@@ -23,8 +23,8 @@ void
 Audio_staff::output (Midi_stream& midi_stream_r, int track_i)
 {
   Midi_track midi_track;
-  midi_track.number_i_ = track_i;
-  midi_track.channel_i_ = channel_i_;
+  midi_track.number_ = track_i;
+  midi_track.channel_ = channel_;
   for (Midi_walker i (this, &midi_track); i.ok (); i++)
     i.process ();
   midi_stream_r << midi_track;