release: 1.0.1

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 7fc60a1d642a32b3ef837d7ba61ec4fea5dece3c..202205d0899524a71a60fd9cf34cb54d1d4ccd11 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
 
 */
 #include <math.h>
@@ -23,18 +23,10 @@
 
 Midi_def::Midi_def()
 {
-  outfile_str_ = ""; 
   // ugh
   set_tempo (Moment (1, 4), 60);
 }
 
-Midi_def::Midi_def (Midi_def const& s)
-  : Music_output_def (s)
-{
-  whole_seconds_f_ = s.whole_seconds_f_;
-  outfile_str_ = s.outfile_str_;
-}
-
 Midi_def::~Midi_def()
 {
 }
@@ -43,35 +35,44 @@ Real
 Midi_def::duration_to_seconds_f (Moment mom)
 {
   if (!mom)
-       return 0;
+    return 0;
   
-  return Moment (whole_seconds_f_) * mom;
+  return Moment (whole_in_seconds_mom_) * mom;
 }
 
 
-
 int
-Midi_def::get_tempo_i (Moment moment)
+Midi_def::get_tempo_i (Moment one_beat_mom)
+{
+  Moment wholes_per_min = Moment(60) /Moment(whole_in_seconds_mom_);
+  int beats_per_min = wholes_per_min / one_beat_mom;
+  return int (beats_per_min);
+}
+
+void
+Midi_def::set_tempo (Moment one_beat_mom, int beats_per_minute_i)
 {
-  return Moment (whole_seconds_f_) * Moment (60) * moment;
+  Moment beats_per_second = Moment (beats_per_minute_i) / Moment (60);
+  whole_in_seconds_mom_ = Moment(1)/Moment(beats_per_second * one_beat_mom);
 }
 
 void
 Midi_def::print() const
 {
 #ifndef NPRINT
+  Music_output_def::print ();
   DOUT << "Midi {";
-  DOUT << "4/min: " << Real (60) / (whole_seconds_f_ * 4);
-  DOUT << "out: " << outfile_str_;
+  DOUT << "4/min: " << Moment (60) / (whole_in_seconds_mom_ * Moment (4));
   DOUT << "}\n";
 #endif
 }
 
 
-void
-Midi_def::set_tempo (Moment moment, int count_per_minute_i)
+IMPLEMENT_IS_TYPE_B1(Midi_def, Music_output_def);
+
+int Midi_def::default_count_i_=0;
+int
+Midi_def::get_next_default_count () const
 {
-  whole_seconds_f_ = Moment (count_per_minute_i) / Moment (60) / moment;
+  return default_count_i_++;
 }
-
-IMPLEMENT_IS_TYPE_B1( Midi_def, Music_output_def);