From: fred Date: Mon, 28 Oct 1996 22:28:03 +0000 (+0000) Subject: lilypond-0.0.5 X-Git-Tag: release/1.5.59~7021 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e7124dbc15d72573863bb072f8df5058f9a3ea88;p=lilypond.git lilypond-0.0.5 --- diff --git a/misc.hh b/misc.hh index a22304267f..0321113242 100644 --- 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 diff --git a/sccol.hh b/sccol.hh index 9c22c277a1..21a341d17f 100644 --- 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 durations; - Mtime when; + svec 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); diff --git a/stcol.hh b/stcol.hh index 2b23934c53..060d585fde 100644 --- a/stcol.hh +++ b/stcol.hh @@ -17,7 +17,7 @@ struct Staff_column { svec s_commands; Staff_column(Score_column*s); - bool mus() const ; + bool mus() const; Real when() const; void add(Voice_element*ve); /****************************************************************