release: 1.0.1

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

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 800c1e9cd17169d2b813f583c94f56b20f2e0685..202205d0899524a71a60fd9cf34cb54d1d4ccd11 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -3,16 +3,16 @@
 
   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>
 #include "misc.hh"
 #include "midi-def.hh"
-#include "input-translator.hh"
-#include "performer-group-performer.hh"
+#include "translator.hh"
+#include "performance.hh"
 #include "assoc-iter.hh"
-
+#include "score-performer.hh"
 #include "debug.hh"
 
 // classes, alphasorted
@@ -21,74 +21,58 @@
 //     destructor
 //     routines, alphasorted
 
-// statics Midi_def
-// ugh
-
-int Midi_def::den_i_s = 4;
-int Midi_def::num_i_s = 4;
-
 Midi_def::Midi_def()
 {
-    outfile_str_ = ""; 
-    itrans_p_ = 0;
-    // ugh
-    set_tempo( Moment( 1, 4 ), 60 );
-}
-
-Midi_def::Midi_def( Midi_def const& s )
-{
-    whole_seconds_f_ = s.whole_seconds_f_;
-    itrans_p_ = s.itrans_p_ ? new Input_translator( *s.itrans_p_ ) : 0;
-    outfile_str_ = s.outfile_str_;
+  // ugh
+  set_tempo (Moment (1, 4), 60);
 }
 
 Midi_def::~Midi_def()
 {
-    delete itrans_p_;
 }
 
 Real
-Midi_def::duration_to_seconds_f( Moment mom )
+Midi_def::duration_to_seconds_f (Moment mom)
 {
-    if ( !mom )
-       return 0;
-    
-    return Moment( whole_seconds_f_ ) * mom;
+  if (!mom)
+    return 0;
+  
+  return Moment (whole_in_seconds_mom_) * mom;
 }
 
-Global_translator*
-Midi_def::get_global_translator_p() const
+
+int
+Midi_def::get_tempo_i (Moment one_beat_mom)
 {
-    return  itrans_p_->get_group_performer_p()->global_l();
+  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);
 }
 
-int
-Midi_def::get_tempo_i( Moment moment )
+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
-    mtor << "Midi {";
-    mtor << "4/min: " << Real( 60 ) / ( whole_seconds_f_ * 4 );
-    mtor << "out: " << outfile_str_;
-    mtor << "}\n";
+  Music_output_def::print ();
+  DOUT << "Midi {";
+  DOUT << "4/min: " << Moment (60) / (whole_in_seconds_mom_ * Moment (4));
+  DOUT << "}\n";
 #endif
 }
 
-void
-Midi_def::set( Input_translator* itrans_p )
-{
-    delete itrans_p_;
-    itrans_p_ = itrans_p;
-}
 
-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_++;
 }
-