X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fduration.hh;h=6233fc1b2d4fdff1c897cc33c040e8145fbf457e;hb=fa2752d8e32002aa240d97a763f1bfcf35bd6aa0;hp=06680e1b9e8d8d9f41768e57e270064336a2a2e2;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 06680e1b9e..6233fc1b2d 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,52 +1,60 @@
 /*
-  duration.hh -- declare Duration
-  
-  source file of the LilyPond music typesetter
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef DURATION_HH
 #define DURATION_HH
 
-#include "flower-proto.hh"
 #include "moment.hh"
-#include "smobs.hh"
 
 /**
    A musical duration.
-  */
-struct Duration {
+*/
+struct Duration : public Simple_smob<Duration>
+{
+  static SCM equal_p (SCM, SCM);
+  int print_smob (SCM, scm_print_state *) const;
+  static const char * const type_p_name_;
   Duration ();
   Duration (int, int);
-  String str () const;
-  void set_plet (int,int );
+  Duration (Rational, bool scale);
+  string to_string () const;
+
   Duration compressed (Rational) const;
-  Rational length_mom () const ;
-  static int compare (Duration const&, Duration const&);
+  Rational get_length () const;
+  Rational factor () const { return factor_; }
+  int duration_log () const;
+  int dot_count () const;
 
-  SCM smobbed_copy () const;
-  DECLARE_SCHEME_CALLBACK(less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS(Duration,);
+  static int compare (Duration const &, Duration const &);
 
-public:
-  int duration_log ()const;
-  int dot_count () const;
-  
-private:
-    /// Logarithm of the base duration.
-  int durlog_i_;
-  int dots_i_;
+  DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
 
-  Moment factor_;
+private:
+  /// Logarithm of the base duration.
+  int durlog_;
+  int dots_;
 
+  Rational factor_;
 };
 
-#include "compare.hh"
-INSTANTIATE_COMPARE(Duration, Duration::compare);
-Duration*unsmob_duration(SCM);
-// int compare (Array<Duration>*, Array<Duration>*);
+INSTANTIATE_COMPARE (Duration, Duration::compare);
 
-#endif // DURATION_HH
+extern SCM Duration_type_p_proc;
 
+#endif // DURATION_HH