X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fduration.hh;h=69cbba5e9df8b7e3db2597312253722c01fe071a;hb=a6bbe2fa3fceea9a153dad35294679ae54868671;hp=793042cb23cf884c6e0e60ae7deb31876a8770ac;hpb=c659cb200486c2f908703696a1b2873e78c8160a;p=lilypond.git diff --git a/lily/include/duration.hh b/lily/include/duration.hh index 793042cb23..69cbba5e9d 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -1,10 +1,9 @@ /* duration.hh -- declare Duration - - source file of the LilyPond music typesetter - (c) 1997--2004 Jan Nieuwenhuizen + source file of the LilyPond music typesetter + (c) 1997--2009 Jan Nieuwenhuizen */ #ifndef DURATION_HH @@ -14,27 +13,29 @@ /** A musical duration. - */ -struct Duration { +*/ +struct Duration +{ public: - + Duration (); Duration (int, int); - String to_string () const; + Duration (Rational, bool scale); + string to_string () const; Duration compressed (Rational) const; - Rational get_length () const ; + Rational get_length () const; Rational factor () const { return factor_; } - int duration_log ()const; + int duration_log () const; int dot_count () const; - static int compare (Duration const&, Duration const&); + static int compare (Duration const &, Duration const &); DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b)); - DECLARE_SIMPLE_SMOBS (Duration,); + DECLARE_SIMPLE_SMOBS (Duration); private: - /// Logarithm of the base duration. + /// Logarithm of the base duration. int durlog_; int dots_;