X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-def.cc;h=d30e94e599a37407ce6961c735ced9e4d28ae346;hb=36a2ef8fd1db451ea9318743561856b4f0907ba2;hp=2f703f01f8f3478bb9bc08f98de562544fd29f20;hpb=04f01c7e890bd4f1b358378e5911fb7c117c3802;p=lilypond.git

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 2f703f01f8..d30e94e599 100644
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -1,69 +1,51 @@
-//
-// midi-def.cc -- implement midi output
-//
-// source file of the GNU LilyPond music typesetter
-//
-// (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-def.cc -- implement midi output def functions
 
-#include <math.h>
-#include "misc.hh"
-#include "midi-def.hh"
-#include "debug.hh"
+  source file of the GNU LilyPond music typesetter
 
-// classes, alphasorted
-//     statics
-//     constructors
-//     destructor
-//     routines, alphasorted
+  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 
-// statics Midi_def
-// ugh
-int Midi_def::den_i_s = 4;
-int Midi_def::num_i_s = 4;
+*/
+#include <math.h>
 
-Midi_def::Midi_def()
-{
-    set_tempo( Moment( 1, 4 ), 60 );
-    outfile_str_ = "lelie.midi"; 
-}
+#include "misc.hh"
+#include "output-def.hh"
+#include "moment.hh"
+#include "warn.hh"
+#include "scm-hash.hh"
 
-Midi_def::Midi_def( Midi_def const& midi_c_r )
-{
-    whole_seconds_f_ = midi_c_r.whole_seconds_f_;
-    outfile_str_ = midi_c_r.outfile_str_;
-}
 
-Midi_def::~Midi_def()
-{
-}
-
-Real
-Midi_def::duration_to_seconds_f( Moment moment )
-{
-    if (!moment)
-	return 0;
-    
-    return Moment( whole_seconds_f_ ) * moment;
-}
 
 int
-Midi_def::get_tempo_i( Moment moment )
+get_tempo (Output_def * def,
+	   Moment one_beat_mom)
 {
-    return Moment( whole_seconds_f_ ) * Moment( 60 ) * moment;
+  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::print() const
+set_tempo (Output_def * def,
+	   Moment one_beat_mom,
+	   int beats_per_minute_i)
 {
-#ifndef NPRINT
-    mtor << "Midi {4/min: " << Real( 60 ) / ( whole_seconds_f_ * 4 );
-    mtor << "out: " << outfile_str_;
-    mtor << "}\n";
-#endif
-}
+  Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60);
 
-void
-Midi_def::set_tempo( Moment moment, int count_per_minute_i )
-{
-    whole_seconds_f_ = Moment( count_per_minute_i ) / Moment( 60 ) / moment;
+  Moment m = Moment (1)/Moment (beats_per_second * one_beat_mom);
+  def->set_variable (ly_symbol2scm ("whole-in-seconds"), m.smobbed_copy ());
 }
+