release: 1.5.21

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 20174ca73fd7101495d8d38188dd286eec39b951..a0599d107f83b41a21212d460c609f82d226cba9 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -16,15 +16,27 @@
 Midi_def::Midi_def ()
 {
   // ugh
-  set_tempo (Moment (1, 4), 60);
+  set_tempo (Moment (Rational (1, 4)), 60);
 }
 
 int
 Midi_def::get_tempo_i (Moment one_beat_mom)
 {
-  Moment w = *unsmob_moment (scope_p_->scm_elem ("whole-in-seconds"));
-  Moment wholes_per_min = Moment (60) /w;
-  int beats_per_min = wholes_per_min / one_beat_mom;
+  SCM wis  = ly_symbol2scm ("whole-in-seconds");
+  Moment *w = unsmob_moment (scope_p_->scm_elem (wis));
+
+  Moment wholes_per_min = Moment (60);
+  if (!w)
+    {
+      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);
 }