X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fperformer.hh;h=3e7af707102fc26e9697c7f5940d1510f5e9e804;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=b912cd720c80d5161edd8625a1102d682a59ac73;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git diff --git a/lily/include/performer.hh b/lily/include/performer.hh index b912cd720c..3e7af70710 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -1,7 +1,7 @@ /* performer.hh -- declare Performer - (c) 1996--2005 Han-Wen Nienhuys + (c) 1996--2008 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -9,25 +9,22 @@ #define PERFORMER_HH #include "audio-element-info.hh" -#include "event.hh" #include "grob-info.hh" #include "translator.hh" /* Convert a music definition into a audio representation. A baseclass. */ -class Performer : public virtual Translator +class Performer : public Translator { public: VIRTUAL_COPY_CONSTRUCTOR (Translator, Performer); - friend class Performer_group_performer; - Performer_group_performer *get_daddy_performer () const; + friend class Performer_group; + Performer_group *get_daddy_performer () const; protected: virtual void announce_element (Audio_element_info); virtual void acknowledge_audio_element (Audio_element_info); virtual void create_audio_elements (); - virtual int get_tempo () const; - virtual void play_element (Audio_element *elem); }; #endif /* PERFORMER_HH */