Merge branch 'lilypond/translation' of ssh://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 c00fc2fcaaf145dfeddb606836a2e25fed6a8f01..aa9f66e01656dc119c2be5ca070cd565d405f936 100644 (file)
--- a/lily/include/duration.hh
+++ b/lily/include/duration.hh
@@ -1,37 +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--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1997--2010 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 "rational.hh"
-
+#include "moment.hh"
 
 /**
    A musical duration.
-  */
-struct Duration {
+*/
+struct Duration
+{
+public:
+
   Duration ();
-  /// is the "plet factor" of this note != 1 ?
-  bool plet_b ();
-  String str () const;
-  void set_plet (int,int );
-  void compress (Rational);
-  Rational length_mom () const ;
+  Duration (int, int);
+  Duration (Rational, bool scale);
+  string to_string () const;
 
+  Duration compressed (Rational) const;
+  Rational get_length () const;
+  Rational factor () const { return factor_; }
+  int duration_log () const;
+  int dot_count () const;
+
+  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.
-  int durlog_i_;
-  int dots_i_;
-  int tuplet_iso_i_;  // 2/3; 2 is not duration, maar of count!
-  int tuplet_type_i_; 
+  int durlog_;
+  int dots_;
 
+  Rational factor_;
 };
+
+INSTANTIATE_COMPARE (Duration, Duration::compare);
+DECLARE_UNSMOB (Duration, duration);
+
 #endif // DURATION_HH