Issue 4550 (2/2) Avoid "using namespace std;" in included files

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

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 665593edd67e090d91de486b0dd93bc1014a621f..ca5c36fa944c613eb8ba6d06776ecf7c57715c5d 100644 (file)
--- 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
@@ -27,13 +27,19 @@
 struct Audio_staff : public Audio_element
 {
   void add_audio_item (Audio_item *ai);
-  void output (Midi_stream &midi_stream_r, int track, bool port);
+  void output (Midi_stream &midi_stream_r, int track, bool port, int start_tick);
 
   Audio_staff ();
-  
+
   bool percussion_;
   bool merge_unisons_;
-  vector<Audio_item*> audio_items_;
+  std::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