X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-staff.hh;h=665593edd67e090d91de486b0dd93bc1014a621f;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=d3e29e80bc72abf9a6b5a38f4377475d9cc041d2;hpb=a8c9e8a7ca320ab0df5fd32e717fd62cd7635ce6;p=lilypond.git

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index d3e29e80bc..665593edd6 100644
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,20 @@
 /*
-  audio-staff.hh -- declare Audio_staff
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 1996--2009 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2011 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_STAFF_HH
@@ -13,13 +26,14 @@
 
 struct Audio_staff : public Audio_element
 {
-  void add_audio_item (Audio_item *l);
-  void output (Midi_stream &midi_stream_r, int track);
+  void add_audio_item (Audio_item *ai);
+  void output (Midi_stream &midi_stream_r, int track, bool port);
 
   Audio_staff ();
   
+  bool percussion_;
+  bool merge_unisons_;
   vector<Audio_item*> audio_items_;
-  int channel_;
 };
 
 #endif // AUDIO_STAFF_HH