* The grand 2005-2006 replace.

[lilypond.git] / lily / midi-def.cc

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 341ff00e266b0bebb774fdb658f1e2ba19586227..c3b80dbeae332a60a1a71eeb5c51e498104aca39 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,11 +3,9 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
-
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include <math.h>
 
 #include "misc.hh"
 #include "output-def.hh"
@@ -16,35 +14,33 @@
 #include "scm-hash.hh"
 
 int
-get_tempo (Output_def * def,
+get_tempo (Output_def *def,
           Moment one_beat_mom)
 {
-  SCM wis  = ly_symbol2scm ("whole-in-seconds");
+  SCM wis = ly_symbol2scm ("whole-in-seconds");
   Moment *w = unsmob_moment (def->lookup_variable (wis));
 
   Moment wholes_per_min = Moment (60);
   if (!w)
     {
-      programming_error  ("wholes-in-seconds not set.");
+      programming_error ("wholes-in-seconds not set.");
       wholes_per_min /= 4;
     }
   else
-    {
-      wholes_per_min /= *w; 
-    }
-  
-  int beats_per_min =  int ((wholes_per_min / one_beat_mom).main_part_);
-  return int (beats_per_min);
+    wholes_per_min /= *w;
+
+  Rational beats_per_min =  (wholes_per_min / one_beat_mom).main_part_;
+  return beats_per_min.to_int ();
 }
 
 void
-set_tempo (Output_def * def,
+set_tempo (Output_def *def,
           Moment one_beat_mom,
           int beats_per_minute_i)
 {
   Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60);
 
-  Moment m = Moment (1)/Moment (beats_per_second * one_beat_mom);
+  Moment m = Moment (1) / Moment (beats_per_second * one_beat_mom);
   def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }