X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fduration.hh;h=69cbba5e9df8b7e3db2597312253722c01fe071a;hb=2f38710a2b40a24977441aa7faa05b6ab132f3cf;hp=6d8667febbf83ac7bcf69cb514406fd92dc8b817;hpb=7949941eb50f6243b76ded2dd331501027b68448;p=lilypond.git

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 6d8667febb..69cbba5e9d 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,49 +1,47 @@
 /*
   duration.hh -- declare Duration
-  
-  source file of the LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
+  source file of the LilyPond music typesetter
 
+  (c) 1997--2009 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef DURATION_HH
 #define DURATION_HH
 
-#include "flower-proto.hh"
 #include "moment.hh"
-#include "smobs.hh"
 
 /**
    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_;
 
   Rational factor_;
 };
 
-#include "compare.hh"
 INSTANTIATE_COMPARE (Duration, Duration::compare);
 DECLARE_UNSMOB (Duration, duration);