]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.0.5
authorfred <fred>
Mon, 28 Oct 1996 22:28:03 +0000 (22:28 +0000)
committerfred <fred>
Mon, 28 Oct 1996 22:28:03 +0000 (22:28 +0000)
misc.hh
sccol.hh
stcol.hh

diff --git a/misc.hh b/misc.hh
index a22304267f6075a197df16657007ea1d7adc641e..03211132422c00eddc55230c7c4db1c51b9f3933 100644 (file)
--- a/misc.hh
+++ b/misc.hh
@@ -1,7 +1,7 @@
 #ifndef MISC_HH
 #define MISC_HH
-#include "mtime.hh"
+#include "real.hh"
 int intlog2(int d);
-Real duration_to_idealspace(Mtime d,Real w);
+Real duration_to_idealspace(Real d,Real w);
 
 #endif
index 9c22c277a1b6e2ed489d62f494fde368ee8d7d83..21a341d17f7ee810a7c7dbae17179ce144c69f2d 100644 (file)
--- a/sccol.hh
+++ b/sccol.hh
@@ -7,19 +7,18 @@
 #ifndef SCCOL_HH
 #define SCCOL_HH
 #include "pcol.hh"
-#include "mtime.hh"
 
 
 struct Score_column {
     PCol * pcol;
-    svec<Mtime> durations;
-    Mtime when;
+    svec<Real> durations;
+    Real when;
 
     /// 
     bool musical;
     
 
-    Score_column(Mtime when);
+    Score_column(Real when);
 
     static int compare(Score_column & c1, Score_column &c2) {
        return sgn(c1.when - c2.when);
index 2b23934c53851f7344cf8da181dbe2a28fa88916..060d585fdedf8198d26abf03b011e58eb55ab713 100644 (file)
--- a/stcol.hh
+++ b/stcol.hh
@@ -17,7 +17,7 @@ struct Staff_column {
     svec<Command *> s_commands;
     
     Staff_column(Score_column*s); 
-    bool mus() const ;
+    bool mus() const;
     Real when() const;
     void add(Voice_element*ve);
     /****************************************************************