Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

[lilypond.git] / lily / include / duration.hh

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index f301fe296acab5406623fabee68db870cae4e134..e337ac58cb4fc5764c2175f1774645c8009ea97c 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,50 +1,46 @@
 /*
   duration.hh -- declare Duration
-  
-  source file of the LilyPond music typesetter
 
-  (c)  1997--2002 Jan Nieuwenhuizen <janneke@gnu.org>
+  source file of the LilyPond music typesetter
 
+  (c) 1997--2007 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 str () const;
+  string to_string () const;
 
   Duration compressed (Rational) const;
-  Rational length_mom () 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 &);
 
-  SCM smobbed_copy () const;
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Duration,);
+  DECLARE_SIMPLE_SMOBS (Duration);
 
 private:
-    /// Logarithm of the base duration.
-  int durlog_i_;
-  int dots_i_;
+  /// Logarithm of the base duration.
+  int durlog_;
+  int dots_;
 
   Rational factor_;
 };
 
-#include "compare.hh"
 INSTANTIATE_COMPARE (Duration, Duration::compare);
 DECLARE_UNSMOB (Duration, duration);