release: 1.0.1

[lilypond.git] / lily / include / midi-def.hh

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index 115158dfdcd0cec62a0545452a65f0d5d3c66b09..dcf0a9819dc7e7806e22b48a331b59584ec05ce4 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -3,12 +3,13 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
 #ifndef MIDI_DEF_HH
 #define MIDI_DEF_HH
+
 #include "lily-proto.hh"
 #include "real.hh"
 #include "string.hh"
@@ -19,28 +20,22 @@
   definitions for midi output. Rather empty
  */
 class Midi_def : public Music_output_def {
+  static int default_count_i_;
 public:
-  // ugh!
-  static int den_i_s;
-  static int num_i_s;
   VIRTUAL_COPY_CONS(Midi_def, Music_output_def);
   DECLARE_MY_RUNTIME_TYPEINFO;
-  Input_translator* itrans_p_;
 
-  /// duration of whole note
-  Real whole_seconds_f_;
+  /// duration of whole note measured in seconds.
+  Moment whole_in_seconds_mom_;
 
   Midi_def();
-  Midi_def (Midi_def const& midi_c_r);
   ~Midi_def();
 
   Real duration_to_seconds_f (Moment);
   int get_tempo_i (Moment moment);
   void print() const;
-  void set (Input_translator* itrans_p);
   void set_tempo (Moment moment, int count_per_minute_i);
-protected:
-  virtual Global_translator * get_global_translator_p ();  
+  virtual int get_next_default_count () const;
 };
 
 #endif // MIDI_DEF_HH