2003 -> 2004

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index f5cbd2a9529c73b869354e3c3b550fd4e3b6f3c3..234ebeb2aaf6f1cf968e693e81fde8726d47c96b 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,34 +3,40 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 #include <math.h>
 #include "misc.hh"
 #include "midi-def.hh"
 #include "performance.hh"
-#include "debug.hh"
-#include "scope.hh"
+#include "warn.hh"
+#include "scm-hash.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)
+Midi_def::get_tempo (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 (lookup_variable (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,7 @@ 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 = Moment(1)/Moment(beats_per_second * one_beat_mom);
-  scope_p_->set ("whole-in-seconds", m.make_scm());
-}
-
-
-int Midi_def::default_count_i_=0;
-
-int
-Midi_def::get_next_default_count () const
-{
-  return default_count_i_++;
+  Moment m = Moment (1)/Moment (beats_per_second * one_beat_mom);
+  set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
 
-void
-Midi_def::reset_default_count ()
-{
-  default_count_i_ = 0;
-}