* lily/pfb.cc (LY_DEFINE): ly:ttf->pfa, new function.

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index e42f2dce6e4e7c3fab47266dd8cb937566fda09b..bc0bc0b4e042d6555df7f97d03c79e1c35020dc5 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,29 +1,26 @@
 /*
-  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--2005 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));
+  Moment *w = unsmob_moment (def->lookup_variable (wis));
 
   Moment wholes_per_min = Moment (60);
   if (!w)
@@ -41,11 +38,13 @@ Midi_def::get_tempo (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);
-  set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
+  def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }