X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fduration.cc;h=413ac889ec497e7447b5e443c8e783b3704513dd;hb=ce134047181514ea0209630752d736859393b1ca;hp=87c6dcfd0c64782621582118c78db542aaff7ed6;hpb=92b42d1e577d7c34248fe27534c3eefa1756233f;p=lilypond.git

diff --git a/lily/duration.cc b/lily/duration.cc
index 87c6dcfd0c..413ac889ec 100644
--- a/lily/duration.cc
+++ b/lily/duration.cc
@@ -1,23 +1,18 @@
 /*
   duration.cc -- implement Duration
-  
-  source file of the LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-           Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  source file of the LilyPond music typesetter
 
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include <assert.h>
+#include "duration.hh"
 
 #include "misc.hh"
 #include "lily-proto.hh"
-#include "string.hh"
-#include "moment.hh"
-#include "duration.hh"
-#include "ly-smobs.icc"
-
 
+#include "ly-smobs.icc"
 
 int
 Duration::compare (Duration const &left, Duration const &right)
@@ -29,14 +24,14 @@ Duration::Duration ()
 {
   durlog_ = 0;
   dots_ = 0;
-  factor_ = Rational (1,1);
+  factor_ = Rational (1, 1);
 }
 
-Duration::Duration (int l, int d)
+Duration::Duration (int log, int d)
 {
-  durlog_ = l;
+  durlog_ = log;
   dots_ = d;
-  factor_ = Rational (1,1);
+  factor_ = Rational (1, 1);
 }
 
 Duration
@@ -52,12 +47,11 @@ Duration::get_length () const
 {
   Rational mom (1 << abs (durlog_));
 
-  if (durlog_> 0)
-    mom = Rational (1)/mom;
+  if (durlog_ > 0)
+    mom = Rational (1) / mom;
 
   Rational delta = mom;
-
-  for (int d = dots_; d; d--)
+  for (int i = 0; i < dots_; i++)
     {
       delta /= Rational (2);
       mom += delta;
@@ -66,27 +60,22 @@ Duration::get_length () const
   return mom * factor_;
 }
 
-
-
-String
-Duration::string () const
+string
+Duration::to_string () const
 {
-  String s;
+  string s;
 
-  if (durlog_ < 0  )
-    s = "log = "  + to_string (durlog_);
+  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_.string ();
-    }
+    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?");
 
 SCM
@@ -99,20 +88,20 @@ IMPLEMENT_SIMPLE_SMOBS (Duration);
 int
 Duration::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Duration  *r = (Duration *) ly_cdr (s);
-     
+  Duration *r = (Duration *) SCM_CELL_WORD_1 (s);
+
   scm_puts ("#<Duration ", port);
-  scm_display (scm_makfrom0str (r->string ().to_str0 ()), port);
+  scm_display (scm_makfrom0str (r->to_string ().c_str ()), port);
   scm_puts (" >", port);
-  
+
   return 1;
 }
 
 SCM
-Duration::equal_p (SCM a , SCM b)
+Duration::equal_p (SCM a, SCM b)
 {
-  Duration  *p = (Duration *) ly_cdr (a);
-  Duration  *q = (Duration *) ly_cdr (b);  
+  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_
@@ -120,130 +109,6 @@ Duration::equal_p (SCM a , SCM b)
 
   return eq ? SCM_BOOL_T : SCM_BOOL_F;
 }
-  
-MAKE_SCHEME_CALLBACK (Duration, less_p, 2);
-SCM
-Duration::less_p (SCM p1, SCM p2)
-{
-  Duration *a = unsmob_duration (p1);
-  Duration *b = unsmob_duration (p2);
-
-  if (compare (*a, *b) < 0)
-    return SCM_BOOL_T;
-  else
-    return SCM_BOOL_F;
-}
-
-LY_DEFINE(duration_less, "ly:duration<?", 2,0,0, (SCM p1, SCM p2),
-	  "Is @var{p1} shorter than @var{p2}?")
-{
-  Duration *a = unsmob_duration (p1);
-  Duration *b = unsmob_duration (p2);
-
-  SCM_ASSERT_TYPE(a, p1, SCM_ARG1, __FUNCTION__, "Duration");
-  SCM_ASSERT_TYPE(b, p2, SCM_ARG2, __FUNCTION__, "Duration");
-
-  if (Duration::compare (*a, *b) < 0)
-    return SCM_BOOL_T;
-  else
-    return SCM_BOOL_F;
-}
-
-
-LY_DEFINE(make_duration,
-	  "ly:make-duration", 2, 2, 0, (SCM length, SCM dotcount,
-				     SCM num, SCM den),
-"	  \n"
-"@var{length} is the negative logarithm (base 2) of the duration:\n"
-"1 is a half note, 2 is a quarter note, 3 is an eighth\n"
-"note, etc.  The number of dots after the note is given by\n"
-"@var{dotcount}.\n"
-"\n"
-"The duration factor is optionally given by @var{num} and @var{den}.\n"
-"\n"
-"A duration is a musical duration, i.e. a length of time described by a\n"
-"power of two (whole, half, quarter, etc.) and a number of augmentation\n"
-"dots. \n"
-"\n"
-"")
-{
-  SCM_ASSERT_TYPE(gh_number_p (length), length, SCM_ARG1, __FUNCTION__, "integer");
-  SCM_ASSERT_TYPE(gh_number_p (dotcount), dotcount, SCM_ARG2, __FUNCTION__, "integer");
-
-  bool compress = false;
-  if (num != SCM_UNDEFINED)
-    {
-      SCM_ASSERT_TYPE(gh_number_p (num), length, SCM_ARG3, __FUNCTION__, "integer");
-      compress = true;
-    }
-  else
-    num = gh_int2scm (1);
-  
-  if (den != SCM_UNDEFINED)
-    SCM_ASSERT_TYPE(gh_number_p (den), length, SCM_ARG4, __FUNCTION__, "integer");
-  else
-    den = gh_int2scm (1);
-  
-  Duration p (gh_scm2int (length), gh_scm2int (dotcount));
-  if (compress)
-    p = p.compressed (Rational (gh_scm2int (num), gh_scm2int (den)));
-
-  return p.smobbed_copy ();
-}
-
-
-
-LY_DEFINE(duration_log,
-	  "ly:duration-log", 1, 0, 0, (SCM dur),
-	  "Extract the duration log from @var{dur}"
-)
-{
-  SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration");
-
-  return gh_int2scm (unsmob_duration (dur)->duration_log ());
-}
-
-
-LY_DEFINE(dot_count_log,
-	  "ly:duration-dot-count", 1, 0, 0, (SCM dur),
-	  "Extract the dot count from @var{dur}"
-)
-{
-  SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration");
-
-  return gh_int2scm (unsmob_duration (dur)->dot_count ());
-}
-
-
-LY_DEFINE(ly_intlog2,
-	  "ly:intlog2", 1, 0, 0, (SCM d),
-	  "The 2-logarithm of 1/@var{d}."
-)
-{
-  SCM_ASSERT_TYPE(gh_number_p (d), d, SCM_ARG1, __FUNCTION__, "integer");
-
-  int l = intlog2 (gh_scm2int (d));
-
-  return gh_int2scm (l);
-}
-
-LY_DEFINE(compression_factor,
-	  "ly:duration-factor", 1, 0, 0, (SCM dur),
-	  "Extract the compression factor from @var{dur}. Return as a pair."
-)
-{
-  SCM_ASSERT_TYPE(unsmob_duration(dur), dur, SCM_ARG1, __FUNCTION__, "duration");
-  Rational r =unsmob_duration (dur)->factor ();
-
-  return gh_cons(gh_int2scm (r.num()),gh_int2scm (r.den ())); 
-}
-
-SCM
-Duration::smobbed_copy ()const
-{
-  Duration *  p = new Duration (*this);
-  return p->smobbed_self ();
-}
 
 int
 Duration::duration_log () const
@@ -256,4 +121,3 @@ Duration::dot_count () const
 {
   return dots_;
 }
-