X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lib%2Fduration.cc;h=eca46dd12bdb212c4c72176e0be4e24614127634;hb=refs%2Ftags%2Frelease%2F0.1.43;hp=fab55e756c9a10e786667dc476068517c7b444fa;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lib/duration.cc b/lib/duration.cc
index fab55e756c..eca46dd12b 100644
--- a/lib/duration.cc
+++ b/lib/duration.cc
@@ -7,6 +7,7 @@
            Han-Wen Nienhuys <hanwen@stack.nl>
 */
 
+#include <assert.h>
 #include "proto.hh"
 #include "plist.hh"
 #include "string.hh"
@@ -20,83 +21,61 @@
 int Duration::division_1_i_s = 384 * 4;
 
 
-Duration::Duration()
+Duration::Duration ()
 {
-	type_i_ = 1;
-	dots_i_ = 0;
-	ticks_i_ = 0;
+  durlog_i_ = 0;
+  dots_i_ = 0;
+  ticks_i_ = 0;
 }
 
 bool
-Duration::duration_type_b(int t)
+Duration::duration_type_b (int t)
 {
-    int bit_i=0;
-    while (t > 0)
-    {
-	int rem = t % 2;
-	t /= 2;
-	bit_i += (rem == 1);
-    }
-    return bit_i == 1;
+  /*
+    ugh. Assuming behavior of conversion funcs on broken input.
+   */
+  return t == Duration_convert::type2_i (Duration_convert::i2_type (t));
 }
 
 // ugh, what's this?
-// i should be called "mom()", ... or at least "length_mom()"
+// i should be called "mom ()", ... or at least "length_mom ()"
 Moment
-Duration::length() const
+Duration::length () const
 {
-    return Duration_convert::dur2_mom(*this);
+  return Duration_convert::dur2_mom (*this);
 }
 
 void
-Duration::set_plet(int i, int t)
+Duration::set_plet (int i, int t)
 {
-    plet_.iso_i_ = i; 
-    plet_.type_i_ = t;
+  plet_.iso_i_ = i; 
+  plet_.type_i_ = t;
 }
 
 void
-Duration::set_plet(Duration d)
+Duration::set_plet (Duration d)
 {
-    plet_.iso_i_ = d.plet_.iso_i_; 
-    plet_.type_i_ = d.plet_.type_i_;
+  plet_.iso_i_ = d.plet_.iso_i_; 
+  plet_.type_i_ = d.plet_.type_i_;
 }
 
 void
-Duration::set_ticks( int ticks_i )
+Duration::set_ticks (int ticks_i)
 {
-	assert( !type_i_ );
-	assert( !dots_i_ );
-	ticks_i_ = ticks_i;
+  assert (durlog_i_ <10);
+  assert (!dots_i_);
+  ticks_i_ = ticks_i;
 }
 
 String
-Duration::str()const
+Duration::str () const
 {
-    return Duration_convert::dur2_str(*this);
+  return Duration_convert::dur2_str (*this);
 }
 
-Plet::Plet()
-{
-    type_i_ = 1;
-    iso_i_ = 1;
-}
-
-Moment
-Plet::mom()const
-{
-    return  Moment( iso_i_, type_i_ );
-}
 
 bool
-Duration::plet_b()
+Duration::plet_b ()
 {
-    return !plet_.unit_b();
+  return !plet_.unit_b ();
 }
-
-bool
-Plet::unit_b()const
-{
-    return type_i_ == 1 && iso_i_ == 1;
-}
-