release: 0.1.11

[lilypond.git] / lib / duration.cc

diff --git a/lib/duration.cc b/lib/duration.cc
index f81b3c2be92ed9d0e74ee6248259b2ac7a7aa7b9..f04c5e42c05b6a4744d91f805aa5f55b9df4fd03 100644 (file)
--- 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"
@@ -22,29 +23,18 @@ int Duration::division_1_i_s = 384 * 4;
 
 Duration::Duration()
 {
-       type_i_ = 1;
-       dots_i_ = 0;
-       ticks_i_ = 0;
-}
-
-Duration::Duration( int type_i, int dots_i = 0 )
-{
-       type_i_ = type_i;
-       dots_i_ = dots_i;
-       ticks_i_ = 0;
+  durlog_i_ = 0;
+  dots_i_ = 0;
+  ticks_i_ = 0;
 }
 
 bool
 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?
@@ -52,58 +42,40 @@ Duration::duration_type_b(int t)
 Moment
 Duration::length() const
 {
-    return Duration_convert::dur2_mom(*this);
+  return Duration_convert::dur2_mom(*this);
 }
 
 void
 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)
 {
-    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()
 {
-    return !plet_.unit_b();
+  return !plet_.unit_b();
 }
-
-bool
-Plet::unit_b()const
-{
-    return type_i_ == 1 && iso_i_ == 1;
-}
-