X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-def.cc;h=4d712f7ed3b37bc649d36d88d2ca768216ccdf9e;hb=ea20c95eec3f834ef7d63da4c31bf23bcd80ff28;hp=f5cbd2a9529c73b869354e3c3b550fd4e3b6f3c3;hpb=9c8bcb9a2a1fedb5459e593b18a8c550318e6800;p=lilypond.git

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index f5cbd2a952..4d712f7ed3 100644
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,59 +1,49 @@
 /*
-  midi-def.cc -- implement Midi_def
+  midi-def.cc -- implement midi output def functions
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
-
+  (c) 1997--2005 Jan Nieuwenhuizen <janneke@gnu.org>
 */
-#include <math.h>
-#include "misc.hh"
-#include "midi-def.hh"
-#include "performance.hh"
-#include "debug.hh"
-#include "scope.hh"
-
-Midi_def::Midi_def()
-{
-  // ugh
-  set_tempo (Moment (1, 4), 60);
-}
-
-Midi_def::~Midi_def()
-{
-}
 
+#include <math.h>
 
+#include "misc.hh"
+#include "output-def.hh"
+#include "moment.hh"
+#include "warn.hh"
+#include "scm-hash.hh"
 
 int
-Midi_def::get_tempo_i (Moment one_beat_mom)
+get_tempo (Output_def *def,
+	   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 (def->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);
 }
 
 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.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);
+  def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
 
-void
-Midi_def::reset_default_count ()
-{
-  default_count_i_ = 0;
-}