X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=blobdiff_plain;f=lily%2Finclude%2Frequest.hh;h=4fa49691d879b03d3ef48ffc681c733293235c27;hb=036af34aa44a151b9e67c18e0acccaafdfae9de8;hp=6d9343a0652440238d01b5960ef759eeafb3d0f3;hpb=0d2593e4ef1f3d1eb6994223f1de8f6c8fbcd066;p=lilypond.git diff --git a/lily/include/request.hh b/lily/include/request.hh index 6d9343a065..4fa49691d8 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -8,33 +8,33 @@ #ifndef REQUEST_HH #define REQUEST_HH -// GNU LilyPond's second egg of columbus! #include "glob.hh" #include "string.hh" #include "moment.hh" #include "virtual-methods.hh" #include "input.hh" +#include "music.hh" /** a voice element wants something printed. Hungarian postfix: req @see lilygut manpage */ -class Request : public Input { +class Request : public Music { + public: - Voice_element*elt_l_; + Voice * voice_l(); /* *************** */ - Voice * voice_l(); - Request(); - Request(Request const&); + virtual ~Request(){} NAME_MEMBERS(); - virtual Request* clone() const { return new Request(*this); } - void print()const ; + VIRTUAL_COPY_CONS(Request,Music) + void print()const ; + virtual MInterval time_int() const; virtual void transpose(Melodic_req const &){} virtual Moment duration() const { return 0; } @@ -43,8 +43,6 @@ public: */ virtual Barcheck_req *barcheck() { return 0; } virtual Script_req *script() { return 0;} - virtual Text_req*text() { return 0; } - virtual Rest_req *rest() { return 0; } virtual Span_req *span() { return 0; } virtual Spacing_req * spacing() { return 0; } virtual Blank_req * blank() { return 0; }