X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-staff.hh;h=a4a9d8a0d1386a9fc87e2446ba107fecefb2f54a;hb=6a7c432f7a33081e18cd4a911c459cc8c805e35d;hp=6c3da3b1b9bef4ed63ebc50076df296150e116a4;hpb=16cb456cabf477f6d398ff731aa0f10b60913394;p=lilypond.git

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 6c3da3b1b9..a4a9d8a0d1 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--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--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_STAFF_HH
@@ -13,13 +26,20 @@
 
 struct Audio_staff : public Audio_element
 {
-  void add_audio_item (Audio_item *l);
-  void output (Midi_stream &midi_stream_r, int track_i);
+  void add_audio_item (Audio_item *ai);
+  void output (Midi_stream &midi_stream_r, int track, bool port, int start_tick);
 
   Audio_staff ();
-  
-  vector<Audio_item*> audio_items_;
-  int channel_;
+
+  bool percussion_;
+  bool merge_unisons_;
+  vector<Audio_item *> audio_items_;
+};
+
+// Subtype to identify a staff that represents the "control track" of a MIDI
+// sequence (created by Control_track_performer).
+struct Audio_control_track_staff : public Audio_staff
+{
 };
 
 #endif // AUDIO_STAFF_HH