X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-staff.hh;h=a4a9d8a0d1386a9fc87e2446ba107fecefb2f54a;hb=ec7f5aca60d3df0c22a51bd0c5b0274e0e5994f3;hp=47a58177b458cbe7347899fbe1efde6e6e2a5e90;hpb=55ac733b69643a6bc6a83b706c65cb56efd388ef;p=lilypond.git

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 47a58177b4..a4a9d8a0d1 100644
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 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
@@ -26,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);
+  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