release: 1.3.55

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

diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh
index dbdcead0ffdce695fac37df00130ba8a770b7dd3..67cdcef24911ca37299bfe750f6a69a2c8387ddb 100644 (file)
--- a/lily/include/midi-def.hh
+++ b/lily/include/midi-def.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 
@@ -20,9 +20,10 @@
   definitions for midi output. Rather empty
  */
 class Midi_def : public Music_output_def {
+  static int default_count_i_;
+  int count_per_minute_i;  
 public:
-  VIRTUAL_COPY_CONS(Midi_def, Music_output_def);
-  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS(Music_output_def);
 
   /// duration of whole note measured in seconds.
   Moment whole_in_seconds_mom_;
@@ -30,11 +31,12 @@ public:
   Midi_def();
   ~Midi_def();
 
-  Real duration_to_seconds_f (Moment);
+  Real length_mom_to_seconds_f (Moment);
   int get_tempo_i (Moment moment);
   void print() const;
   void set_tempo (Moment moment, int count_per_minute_i);
+  virtual int get_next_default_count () const;
+  static void reset_default_count();
 };
 
 #endif // MIDI_DEF_HH
-