X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fduration.hh;h=6233fc1b2d4fdff1c897cc33c040e8145fbf457e;hb=3af0951f9a11677240efa6228683dd4fcea13eaf;hp=69cbba5e9df8b7e3db2597312253722c01fe071a;hpb=0e5d83a9ceb4a143f83d22406d7eb816314ff9f7;p=lilypond.git

diff --git a/lily/include/duration.hh b/lily/include/duration.hh
index 69cbba5e9d..6233fc1b2d 100644
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,9 +1,20 @@
 /*
-  duration.hh -- declare Duration
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the LilyPond music typesetter
+  Copyright (C) 1997--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 1997--2009 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
@@ -14,10 +25,11 @@
 /**
    A musical duration.
 */
-struct Duration
+struct Duration : public Simple_smob<Duration>
 {
-public:
-
+  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);
   Duration (Rational, bool scale);
@@ -32,7 +44,6 @@ public:
   static int compare (Duration const &, Duration const &);
 
   DECLARE_SCHEME_CALLBACK (less_p, (SCM a, SCM b));
-  DECLARE_SIMPLE_SMOBS (Duration);
 
 private:
   /// Logarithm of the base duration.
@@ -43,7 +54,7 @@ private:
 };
 
 INSTANTIATE_COMPARE (Duration, Duration::compare);
-DECLARE_UNSMOB (Duration, duration);
 
-#endif // DURATION_HH
+extern SCM Duration_type_p_proc;
 
+#endif // DURATION_HH