X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-staff.hh;h=fe570c3ad1eb8855595212547ea52031960c4317;hb=f875ef39c544bd3499dae5360e9e24f69933575f;hp=9cfecae9986b283295557b5ebae5532ef12fbf64;hpb=a6bd229f7fe1dc4a03478e14ccc0c0c66b225061;p=lilypond.git

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index 9cfecae998..fe570c3ad1 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--2010 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
@@ -26,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 ();
-  
-  vector<Audio_item*> audio_items_;
-  int channel_;
+
+  bool percussion_;
+  bool merge_unisons_;
+  vector<Audio_item *> audio_items_;
 };
 
 #endif // AUDIO_STAFF_HH