X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-def.cc;h=d30e94e599a37407ce6961c735ced9e4d28ae346;hb=4f5b668a1d61ca95adb60d56f1c771748b5a6446;hp=5d76f00341a457c83d15f83f8a9f720258b628c4;hpb=d9b43b93f2c885409bafdb157138158f65cc49aa;p=lilypond.git

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 5d76f00341..d30e94e599 100644
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,29 +1,27 @@
 /*
-  midi-def.cc -- implement Midi_def
+  midi-def.cc -- implement midi output def functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2002 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 "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_i (Moment one_beat_mom)
+get_tempo (Output_def * def,
+	   Moment one_beat_mom)
 {
   SCM wis  = ly_symbol2scm ("whole-in-seconds");
-  Moment *w = unsmob_moment (scope_p_->scm_elem (wis));
+  Moment *w = unsmob_moment (def->lookup_variable (wis));
 
   Moment wholes_per_min = Moment (60);
   if (!w)
@@ -41,25 +39,13 @@ Midi_def::get_tempo_i (Moment one_beat_mom)
 }
 
 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);
-  scope_p_->set ("whole-in-seconds", m.smobbed_copy ());
+  def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
 
-
-int Midi_def::score_count_i_=0;
-
-int
-Midi_def::get_next_score_count () const
-{
-  return score_count_i_++;
-}
-
-void
-Midi_def::reset_score_count ()
-{
-  score_count_i_ = 0;
-}