release: 1.5.21

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 1013399eac1b91fa8c35f01bd8e3bbd339bdffb2..a0599d107f83b41a21212d460c609f82d226cba9 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 #include <math.h>
@@ -13,24 +13,30 @@
 #include "debug.hh"
 #include "scope.hh"
 
-Midi_def::Midi_def()
+Midi_def::Midi_def ()
 {
   // ugh
-  set_tempo (Moment (1, 4), 60);
+  set_tempo (Moment (Rational (1, 4)), 60);
 }
 
-Midi_def::~Midi_def()
-{
-}
-
-
-
 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);
 }
 
@@ -39,21 +45,21 @@ Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i)
 {
   Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60);
 
-  Moment *m = new Moment (Moment(1)/Moment(beats_per_second * one_beat_mom));
-  scope_p_->set ("whole-in-seconds", smobify (m));
+  Moment m = Moment (1)/Moment (beats_per_second * one_beat_mom);
+  scope_p_->set ("whole-in-seconds", m.smobbed_copy ());
 }
 
 
-int Midi_def::default_count_i_=0;
+int Midi_def::score_count_i_=0;
 
 int
-Midi_def::get_next_default_count () const
+Midi_def::get_next_score_count () const
 {
-  return default_count_i_++;
+  return score_count_i_++;
 }
 
 void
-Midi_def::reset_default_count ()
+Midi_def::reset_score_count ()
 {
-  default_count_i_ = 0;
+  score_count_i_ = 0;
 }