X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Faudio-staff.hh;h=19f3bb04a7ee0073339052f03adeff545957fc9f;hb=f4ff2e488239d66830ac8b3ae5771358a917b58f;hp=7e91d7fd0ba906e4964b0f7f591a650d80324c7b;hpb=a19cd9c5efcc258ac73e34eac5223879393b6b50;p=lilypond.git diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 7e91d7fd0b..19f3bb04a7 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -1,23 +1,23 @@ /* audio-staff.hh -- declare Audio_staff - (c) 1996, 1997 Jan Nieuwenhuizen + (c) 1996--2004 Jan Nieuwenhuizen */ #ifndef AUDIO_STAFF_HH #define AUDIO_STAFF_HH -#include "proto.hh" -#include "plist.hh" +#include "parray.hh" #include "lily-proto.hh" #include "audio-element.hh" -struct Audio_staff : public Audio_element { - void add( Audio_item* l); - void output( Midi_stream& midi_stream_r, int track_i ); +struct Audio_staff : public Audio_element +{ + void add_audio_item (Audio_item* l); + void output (Midi_stream& midi_stream_r, int track_i); - Link_list audio_item_l_list_; - DECLARE_MY_RUNTIME_TYPEINFO; + Link_array audio_items_; + int channel_; }; #endif // AUDIO_STAFF_HH