X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=78c9275a4e971bb0b2cd4443c8bd985e859fcba9;hb=eb72c0f066957c3e71d336db0f72814e34d3964d;hp=7710e4dcc037d9a9c349674f67784c9adf65f434;hpb=11be23f380bcb249d49269cfa6f7889c6829011f;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 7710e4dcc0..78c9275a4e 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -1,99 +1,123 @@
 /*
-  duration.cc -- implement Duration, Plet, 
+  duration.cc -- implement Duration
 
   source file of the LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-           Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <assert.h>
+#include "duration.hh"
 
+#include "misc.hh"
 #include "lily-proto.hh"
-#include "string.hh"
-#include "moment.hh"
-#include "duration.hh"
 
-int
-compare (Array<Duration>* left, Array<Duration>* right)
-{
-  assert (left);
-  assert (right);
-  
-  if (left->size () == right->size ())
-    {
-      for (int i = 0; i < left->size (); i++)
-	{
-	  int r = Duration::compare ((*left)[i], (*right)[i]);
-	  if (r)
-	    return r;
-	}
-    }
-  else
-    return 1;
-  return 0;
-}
+#include "ly-smobs.icc"
 
 int
 Duration::compare (Duration const &left, Duration const &right)
 {
-  return Rational::compare (left.length_mom (), right.length_mom ());
+  return Rational::compare (left.get_length (), right.get_length ());
 }
 
 Duration::Duration ()
 {
-  durlog_i_ = 0;
-  dots_i_ = 0;
-  tuplet_iso_i_ = 1;
-  tuplet_type_i_ = 1;
+  durlog_ = 0;
+  dots_ = 0;
+  factor_ = Rational (1, 1);
+}
+
+Duration::Duration (int log, int d)
+{
+  durlog_ = log;
+  dots_ = d;
+  factor_ = Rational (1, 1);
 }
 
-void
-Duration::compress (Rational m)
+Duration
+Duration::compressed (Rational m) const
 {
-  tuplet_iso_i_  *= m.num_i ();
-  tuplet_type_i_ *= m.den_i (); 
+  Duration d (*this);
+  d.factor_ *= m;
+  return d;
 }
 
 Rational
-Duration::length_mom () const
+Duration::get_length () const
 {
-  Rational mom (1 << abs (durlog_i_));
+  Rational mom (1 << abs (durlog_));
 
-  if (durlog_i_> 0)
-    mom = Moment (1)/mom;
+  if (durlog_ > 0)
+    mom = Rational (1) / mom;
 
   Rational delta = mom;
-
-  for (int d = dots_i_; d; d--)
+  for (int i = 0; i < dots_; i++)
     {
-      delta /= Moment (2);
+      delta /= Rational (2);
       mom += delta;
     }
 
-  return mom * Moment (tuplet_iso_i_, tuplet_type_i_);
+  return mom * factor_;
 }
 
-void
-Duration::set_plet (int i, int t)
+String
+Duration::to_string () const
 {
-  tuplet_iso_i_ = i; 
-  tuplet_type_i_ = t;
+  String s;
+
+  if (durlog_ < 0)
+    s = "log = " + ::to_string (durlog_);
+  else
+    s = ::to_string (1 << durlog_);
+
+  s += ::to_string ('.', dots_);
+  if (factor_ != Moment (Rational (1, 1)))
+    s += "*" + factor_.to_string ();
+  return s;
 }
 
+IMPLEMENT_TYPE_P (Duration, "ly:duration?");
 
-String
-Duration::str () const
+SCM
+Duration::mark_smob (SCM)
 {
-  return to_str (durlog_i_) + to_str ('.', dots_i_);
+  return SCM_EOL;
 }
 
+IMPLEMENT_SIMPLE_SMOBS (Duration);
+int
+Duration::print_smob (SCM s, SCM port, scm_print_state *)
+{
+  Duration *r = (Duration *) SCM_CELL_WORD_1 (s);
+
+  scm_puts ("#<Duration ", port);
+  scm_display (scm_makfrom0str (r->to_string ().to_str0 ()), port);
+  scm_puts (" >", port);
+
+  return 1;
+}
 
-bool
-Duration::plet_b ()
+SCM
+Duration::equal_p (SCM a, SCM b)
 {
-  return tuplet_iso_i_ != 1 || tuplet_type_i_ != 1;
+  Duration *p = (Duration *) SCM_CELL_WORD_1 (a);
+  Duration *q = (Duration *) SCM_CELL_WORD_1 (b);
+
+  bool eq = p->dots_ == q->dots_
+    && p->durlog_ == q->durlog_
+    && p->factor_ == q->factor_;
+
+  return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
+int
+Duration::duration_log () const
+{
+  return durlog_;
+}
 
+int
+Duration::dot_count () const
+{
+  return dots_;
+}