X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmusical-request.hh;h=08cce94c9a9435880a14d657d73a12b628ce4024;hb=6ce61146edb1c36647b514778c29cdc9beedab6a;hp=122f1c20a8954893b68283bed700584add646790;hpb=6a0ea5e307744ad53d8b4a7381f2b27c2cfc9c13;p=lilypond.git diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 122f1c20a8..08cce94c9a 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -36,7 +36,6 @@ public: virtual Dynamic_req* dynamic() { return 0; } virtual Absolute_dynamic_req * absdynamic() { return 0; } virtual Tie_req * tie() { return 0; } - virtual Subtle_req * subtle() { return 0; } virtual Span_dynamic_req * span_dynamic() { return 0; } REQUESTMETHODS(Musical_req, musical); }; @@ -207,21 +206,7 @@ public: }; -/** A helper in the hierarchy. Each dynamic is bound to one note ( a - crescendo spanning multiple notes is thought to be made of two - "dynamics": a start and a stop). Dynamic changes can occur in a - smaller time than the length of its note, therefore fore each - Dynamic request carries a time, measured from the start of its - note. - */ -class Subtle_req : public virtual Musical_req { -public: - /// the time relative to Voice_element start. - Moment subtime_; - REQUESTMETHODS(Subtle_req, subtle); -}; - -class Dynamic_req : public Subtle_req { +class Dynamic_req : public virtual Musical_req { public: /// for absolute dynamics enum Loudness {