* The grand 2005-2006 replace.

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index ec5428971ac23ca635d8a11d7407d451a0fbf5b1..c3b80dbeae332a60a1a71eeb5c51e498104aca39 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,65 +1,46 @@
 /*
-  midi-def.cc -- implement Midi_def
+  midi-def.cc -- implement midi output def functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Jan Nieuwenhuizen <janneke@gnu.org>
-
+  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include <math.h>
+
+
 #include "misc.hh"
-#include "midi-def.hh"
-#include "performance.hh"
+#include "output-def.hh"
+#include "moment.hh"
 #include "warn.hh"
 #include "scm-hash.hh"
 
-Midi_def::Midi_def ()
-{
-  // ugh
-  set_tempo (Moment (Rational (1, 4)), 60);
-}
-
 int
-Midi_def::get_tempo (Moment one_beat_mom)
+get_tempo (Output_def *def,
+          Moment one_beat_mom)
 {
-  SCM wis  = ly_symbol2scm ("whole-in-seconds");
-  Moment *w = unsmob_moment (lookup_variable (wis));
+  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
-Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i)
+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);
-  set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
+  Moment m = Moment (1) / Moment (beats_per_second * one_beat_mom);
+  def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
 
-
-int Midi_def::score_count_=0;
-
-int
-Midi_def::get_next_score_count () const
-{
-  return score_count_++;
-}
-
-void
-Midi_def::reset_score_count ()
-{
-  score_count_ = 0;
-}