release: 1.5.17

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

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 54c4793fb8b05bc97da97993388e4b385735185c..7324349fdc1e75d45b050bb6f679945912bf11e8 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -3,7 +3,7 @@
   
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 
@@ -27,8 +27,8 @@ struct Duration {
   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_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
+  DECLARE_SIMPLE_SMOBS (Duration,);
 
 public:
   int duration_log ()const;
@@ -39,13 +39,13 @@ private:
   int durlog_i_;
   int dots_i_;
 
-  Moment factor_;
+  Rational factor_;
 
 };
 
 #include "compare.hh"
-INSTANTIATE_COMPARE(Duration, Duration::compare);
-Duration*unsmob_duration(SCM);
+INSTANTIATE_COMPARE (Duration, Duration::compare);
+DECLARE_UNSMOB(Duration,duration);
 // int compare (Array<Duration>*, Array<Duration>*);
 
 #endif // DURATION_HH